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.116 by ratnik, Thu Apr 24 17:48:44 2008 UTC vs.
Revision 1.208 by elmer, Wed Sep 1 14:35:28 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.18.00a-200onl2
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 < Patch5: root-5.18-00a-Cintex2
15 < Patch6: root-5.18-00a-TBufferFile
9 > Patch0: root-5.22-00d-externals
10 > Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
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 > Patch24: root-5.22-00d-fireworks8
34 > Patch25: root-5.22-00d-fix-python-shebang
35 > Patch26: root-5.22-00d-RootsysOnMac
36 > Patch27: root-5.22-00d-TString-Clear
37 > Patch28: root-5.22-00d-libgfortran-dylib-detection
38  
39   %define cpu %(echo %cmsplatf | cut -d_ -f2)
16 %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
40  
41 < Requires: gccxml gsl castor libjpg dcap pcre python
41 > Requires: gccxml gsl castor libjpg dcap pcre python fftw3
42  
43 < %if "%{?online_release:set}" != "set"
44 < Requires: qt openssl mysql libpng zlib libungif xrootd
22 < %else
23 < %define skiplibtiff true
24 < %endif
25 <
26 < %if "%cpu" == "amd64"
27 < %define skiplibtiff true
28 < %endif
29 <
30 < %if "%skiplibtiff" != "true"
31 < Requires: libtiff
43 > %if "%online" != "true"
44 > Requires: qt openssl libpng zlib libungif xrootd libtiff
45   %endif
46  
47   %prep
48   %setup -n root
49   %patch0 -p1
50   %patch1 -p1
51 < %patch2 -p0
51 > %patch2 -p1
52   %patch3 -p1
53 < %patch4 -p0
54 < %patch5 -p0
55 < %patch6 -p0
53 > %patch4 -p1
54 >
55 > %patch5 -p1
56 > %patch6 -p1
57 > %patch7 -p1
58 > %patch8 -p1
59 > %patch9 -p1
60 >
61 > # patch10 is compiler version dependent, see below
62 > %patch11 -p1
63 > %patch12 -p1
64 > # patch13 is compiler version dependent, see below
65 >
66 > # work around patch issue...
67 > rm graf3d/gl/src/gl2ps.c
68 > %patch14 -p1
69 > #work around patch issues in patch14(?)
70 > rm graf3d/eve/inc/TEveLegoOverlay.h.orig
71 > rm graf3d/eve/src/TEveLegoOverlay.cxx
72 > rm graf3d/gl/inc/gl2ps.h.orig
73 > rm graf3d/gl/src/gl2ps.c.orig
74 > %patch15 -p1
75 > %patch16 -p1
76 > %patch17 -p1
77 > %patch19 -p1
78 > %patch20 -p1
79 > %patch21 -p1
80 > %patch22 -p1
81 > %patch23 -p1
82 > %patch24 -p1
83 > %patch25 -p1
84 > %patch26 -p1
85 > %patch27 -p1
86 > %patch28 -p2
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 "%{?online_release:set}" == "set"
112 < # Build without mysql, and use system qt.
50 < # 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="
53 <             --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
60             --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="--enable-table
# Line 68 | Line 129 | CONFIG_ARGS="--enable-table
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
73             --enable-qtgsi
74             --enable-mathcore
134               --enable-mathmore
135               --enable-reflex  
136               --enable-cintex
137               --enable-minuit2
138 <             --enable-roofit
138 >             --enable-fftw3
139 >             --with-fftw3-incdir=${FFTW3_ROOT}/include
140 >             --with-fftw3-libdir=${FFTW3_ROOT}/lib
141               --disable-ldap
142               --disable-krb5
143               --with-gsl-incdir=${GSL_ROOT}/include
# Line 84 | Line 145 | CONFIG_ARGS="--enable-table
145               --with-dcap-libdir=${DCAP_ROOT}/lib
146               --with-dcap-incdir=${DCAP_ROOT}/include
147               --disable-pgsql
148 +             --disable-mysql
149               --disable-xml ${EXTRA_CONFIG_ARGS}"
150  
151 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
90 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
91 < %endif
92 <
93 < case $(uname)-$(uname -p) in
151 > case $(uname)-$(uname -m) in
152    Linux-x86_64)
153 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
153 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
154    Linux-i*86)
155      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
156    Darwin*)
157 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
157 >    case %cmsplatf in
158 >    *_ia32_* )
159 >      comparch=i386 ;;
160 >    *_amd64_* )
161 >      comparch=x86_64 ;;
162 >    * )
163 >      comparch=ppc ;;
164 >    esac
165 >    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
166 >    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
167    Linux-ppc64*)
168      ./configure linux $CONFIG_ARGS --disable-rfio;;
169   esac
170  
171 < make  %makeprocesses
171 > case %cmsplatf in
172 >  osx*)
173 >   makeopts=
174 >  ;;
175 >  *)
176 >   makeopts="%makeprocesses"
177 >  ;;
178 > esac
179 >
180 > make $makeopts
181   make cintdlls
182 +
183   %install
184   # Override installers if we are using GNU fileutils cp.  On OS X
185   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 118 | Line 195 | fi
195   export ROOTSYS=%i
196   make INSTALL="$cp" INSTALLDATA="$cp" install
197   mkdir -p $ROOTSYS/lib/python
198 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
198 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
199   #
200  
201   # SCRAM ToolBox toolfile
202   mkdir -p %i/etc/scram.d
203   # rootcore toolfile
204 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore
205 < <doc type=BuildSystem::ToolDoc version=1.0>
206 < <Tool name=rootcore version=%v>
207 < <info url="http://root.cern.ch/root/"></info>
208 < <lib name=Cint>
209 < <lib name=Core>
210 < <lib name=RIO>
211 < <lib name=Net>
212 < <lib name=Tree>
213 < <Client>
214 < <Environment name=ROOTCORE_BASE default="%i"></Environment>
215 < <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
216 < <Environment name=INCLUDE default="$ROOTCORE_BASE/include"></Environment>
217 < <Environment name=INCLUDE default="$ROOTCORE_BASE/cint"></Environment>
218 < </Client>
219 < <use name=sockets>
220 < <use name=pcre>
221 < <use name=zlib>
222 < <Runtime name=PATH value="$ROOTCORE_BASE/bin" type=path>
223 < <Runtime name=ROOTSYS value="$ROOTCORE_BASE/">
224 < <Runtime name=PYTHONPATH value="$ROOTCORE_BASE/lib" type=path>
225 < </Tool>
226 < EOF_TOOLFILE
227 <
228 < # root toolfile
229 < cat << \EOF_TOOLFILE >%i/etc/scram.d/root
230 < <doc type=BuildSystem::ToolDoc version=1.0>
231 < <Tool name=root version=%v>
232 < <info url="http://root.cern.ch/root/"></info>
233 < <lib name=TreePlayer>
234 < <lib name=Gpad>
235 < <lib name=Graf3d>
236 < <lib name=Graf>
237 < <lib name=Hist>
238 < <lib name=Matrix>
239 < <lib name=Physics>
240 < <lib name=Postscript>
241 < <use name=ROOTCore>
242 < </Tool>
204 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore.xml
205 >  <tool name="rootcore" version="%v">
206 >    <info url="http://root.cern.ch/root/"/>
207 >    <lib name="Tree"/>
208 >    <lib name="Net"/>
209 >    <lib name="Thread"/>
210 >    <lib name="MathCore"/>
211 >    <lib name="RIO"/>
212 >    <lib name="Core"/>
213 >    <lib name="Cint"/>
214 >    <client>
215 >      <environment name="ROOTCORE_BASE" default="%i"/>
216 >      <environment name="LIBDIR" default="$ROOTCORE_BASE/lib"/>
217 >      <environment name="INCLUDE" default="$ROOTCORE_BASE/include"/>
218 >      <environment name="INCLUDE" default="$ROOTCORE_BASE/cint"/>
219 >    </client>
220 >    <runtime name="PATH" value="$ROOTCORE_BASE/bin" type="path"/>
221 >    <runtime name="ROOTSYS" value="$ROOTCORE_BASE/"/>
222 >    <runtime name="PYTHONPATH" value="$ROOTCORE_BASE/lib" type="path"/>
223 >    <use name="sockets"/>
224 >    <use name="pcre"/>
225 >    <use name="zlib"/>
226 >  </tool>
227 > EOF_TOOLFILE
228 >
229 > # root toolfile, alias for rootphysics. Using rootphysics is preferred.
230 > cat << \EOF_TOOLFILE >%i/etc/scram.d/root.xml
231 >  <tool name="root" version="%v">
232 >    <info url="http://root.cern.ch/root/"/>
233 >    <use name="rootphysics"/>
234 >  </tool>
235 > EOF_TOOLFILE
236 >
237 > # roothistmatrix toolfile
238 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
239 >  <tool name="roothistmatrix" version="%v">
240 >    <info url="http://root.cern.ch/root/"/>
241 >    <lib name="Hist"/>
242 >    <lib name="Matrix"/>
243 >    <use name="ROOTCore"/>
244 >  </tool>
245 > EOF_TOOLFILE
246 >
247 > # rootgpad toolfile
248 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
249 >  <tool name="rootgpad" version="%v">
250 >    <info url="http://root.cern.ch/root/"/>
251 >    <lib name="Gpad"/>
252 >    <lib name="Graf"/>
253 >    <use name="roothistmatrix"/>
254 >  </tool>
255 > EOF_TOOLFILE
256 >
257 > # rootphysics toolfile
258 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics.xml
259 >  <tool name="rootphysics" version="%v">
260 >    <info url="http://root.cern.ch/root/"/>
261 >    <lib name="Physics"/>
262 >    <use name="roothistmatrix"/>
263 >  </tool>
264 > EOF_TOOLFILE
265 >
266 > # rootgraphics toolfile, identical to old "root" toolfile
267 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics.xml
268 >  <tool name="rootgraphics" version="%v">
269 >    <info url="http://root.cern.ch/root/"/>
270 >    <lib name="TreePlayer"/>
271 >    <lib name="Graf3d"/>
272 >    <lib name="Postscript"/>
273 >    <use name="rootgpad"/>
274 >  </tool>
275   EOF_TOOLFILE
276  
277   # rootcintex toolfile
278 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcintex
279 < <doc type=BuildSystem::ToolDoc version=1.0>
280 < <Tool name=rootcintex version=%v>
281 < <info url="http://root.cern.ch/root/"></info>
282 < <lib name=Cintex>
283 < <use name=ROOTRflx>
284 < <use name=ROOTCore>
285 < </Tool>
286 < EOF_TOOLFILE
287 <
288 < # rootinteractive toolfile
289 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
290 < <doc type=BuildSystem::ToolDoc version=1.0>
291 < <Tool name=rootinteractive version=%v>
292 < <info url="http://root.cern.ch/root/"></info>
293 < <lib name=Rint>
294 < <lib name=GQt>
295 < <use name=qt>
296 < <use name=libjpg>
297 < <use name=libpng>
298 < <use name=ROOT>
299 < </Tool>
278 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcintex.xml
279 >  <tool name="rootcintex" version="%v">
280 >    <info url="http://root.cern.ch/root/"/>
281 >    <lib name="Cintex"/>
282 >    <use name="ROOTRflx"/>
283 >    <use name="ROOTCore"/>
284 >  </tool>
285 > EOF_TOOLFILE
286 >
287 > # rootinteractive toolfile (GQt/qt lib dependencies
288 > # have been moved to rootqt.xml)
289 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
290 >  <tool name="rootinteractive" version="%v">
291 >    <info url="http://root.cern.ch/root/"/>
292 >    <lib name="Rint"/>
293 >    <lib name="Gui"/>
294 >    <use name="libjpg"/>
295 >    <use name="libpng"/>
296 >    <use name="rootgpad"/>
297 >  </tool>
298 > EOF_TOOLFILE
299 >
300 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
301 >  <tool name="rootqt" version="%v">
302 >    <info url="http://root.cern.ch/root/"/>
303 >    <lib name="GQt"/>
304 >    <use name="qt"/>
305 >  </tool>
306   EOF_TOOLFILE
307  
308   # rootmath toolfile
309 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
310 < <doc type=BuildSystem::ToolDoc version=1.0>
311 < <Tool name=rootmath version=%v>
312 < <info url="http://root.cern.ch/root/"></info>
313 < <lib name=MathCore>
314 < <lib name=MathMore>
315 < <use name=ROOTCore>
316 < <use name=gsl>
202 < </Tool>
309 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
310 >  <tool name="rootmath" version="%v">
311 >    <info url="http://root.cern.ch/root/"/>
312 >    <lib name="GenVector"/>
313 >    <lib name="MathMore"/>
314 >    <use name="ROOTCore"/>
315 >    <use name="gsl"/>
316 >  </tool>
317   EOF_TOOLFILE
318  
319   # rootminuit toolfile
320 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit
321 < <doc type=BuildSystem::ToolDoc version=1.0>
322 < <Tool name=rootminuit version=%v>
323 < <info url="http://root.cern.ch/root/"></info>
324 < <lib name=Minuit>
325 < <use name=ROOT>
212 < </Tool>
320 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit.xml
321 >  <tool name="rootminuit" version="%v">
322 >    <info url="http://root.cern.ch/root/"/>
323 >    <lib name="Minuit"/>
324 >    <use name="rootgpad"/>
325 >  </tool>
326   EOF_TOOLFILE
327  
328   # rootminuit2 toolfile
329 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2
330 < <doc type=BuildSystem::ToolDoc version=1.0>
331 < <Tool name=rootminuit2 version=%v>
332 < <info url="http://root.cern.ch/root/"></info>
333 < <lib name=Minuit2>
334 < <use name=ROOT>
222 < </Tool>
329 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2.xml
330 >  <tool name="rootminuit2" version="%v">
331 >    <info url="http://root.cern.ch/root/"/>
332 >    <lib name="Minuit2"/>
333 >    <use name="rootgpad"/>
334 >  </tool>
335   EOF_TOOLFILE
336  
337   # rootrflx toolfile
338 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx
339 < <doc type=BuildSystem::ToolDoc version=1.0>
340 < <Tool name=rootrflx version=%v>
341 < <info url="http://root.cern.ch/root/"></info>
342 < <lib name=Reflex>
343 < <Client>
344 < <Environment name=ROOTRFLX_BASE default="%i"></Environment>
345 < <Environment name=LIBDIR default="$ROOTRFLX_BASE/lib"></Environment>
346 < <Environment name=INCLUDE default="$ROOTRFLX_BASE/include"></Environment>
347 < </Client>
348 < <use name=sockets>
349 < <use name=gccxml>
350 < <Runtime name=PATH value="$ROOTRFLX_BASE/bin" type=path>
351 < <Runtime name=ROOTSYS value="$ROOTRFLX_BASE/">
352 < <Runtime name=GENREFLEX value="$ROOTRFLX_BASE/bin/genreflex">
241 < </Tool>
338 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx.xml
339 >  <tool name="rootrflx" version="%v">
340 >    <info url="http://root.cern.ch/root/"/>
341 >    <lib name="Reflex"/>
342 >    <client>
343 >      <environment name="ROOTRFLX_BASE" default="%i"/>
344 >      <environment name="LIBDIR" default="$ROOTRFLX_BASE/lib"/>
345 >      <environment name="INCLUDE" default="$ROOTRFLX_BASE/include"/>
346 >    </client>
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"/>
350 >    <use name="sockets"/>
351 >    <use name="gccxml"/>
352 >  </tool>
353   EOF_TOOLFILE
354  
355   # roothtml toolfile
356 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml
357 < <doc type=BuildSystem::ToolDoc version=1.0>
358 < <Tool name=roothtml version=%v>
359 < <info url="http://root.cern.ch/root/"></info>
360 < <lib name=Html>
361 < <use name=ROOT>
251 < </Tool>
252 < EOF_TOOLFILE
253 <
254 < # rootroofit toolfile
255 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
256 < <doc type=BuildSystem::ToolDoc version=1.0>
257 < <Tool name=rootroofit version=%v>
258 < <info url="http://root.cern.ch/root/"></info>
259 < <lib name=RooFitCore>
260 < <lib name=RooFit>
261 < <use name=ROOTMinuit>
262 < <use name=ROOTHtml>
263 < </Tool>
356 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml.xml
357 >  <tool name="roothtml" version="%v">
358 >    <info url="http://root.cern.ch/root/"/>
359 >    <lib name="Html"/>
360 >    <use name="rootgpad"/>
361 >  </tool>
362   EOF_TOOLFILE
363  
364   # rootmlp toolfile
365 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp
366 < <doc type=BuildSystem::ToolDoc version=1.0>
367 < <Tool name=rootmlp version=%v>
368 < <info url="http://root.cern.ch/root/"></info>
369 < <lib name=MLP>
370 < <use name=ROOT>
273 < </Tool>
365 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp.xml
366 >  <tool name="rootmlp" version="%v">
367 >    <info url="http://root.cern.ch/root/"/>
368 >    <lib name="MLP"/>
369 >    <use name="RootGraphics"/>
370 >  </tool>
371   EOF_TOOLFILE
372  
373   # roottmva toolfile
374 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva
375 < <doc type=BuildSystem::ToolDoc version=1.0>
376 < <Tool name=roottmva version=%v>
377 < <info url="http://root.cern.ch/root/"></info>
378 < <lib name=TMVA>
379 < <use name=ROOTMLP>
380 < </Tool>
374 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva.xml
375 >  <tool name="roottmva" version="%v">
376 >    <info url="http://root.cern.ch/root/"/>
377 >    <lib name="TMVA"/>
378 >    <use name="ROOTMLP"/>
379 >    <use name="rootminuit"/>
380 >  </tool>
381   EOF_TOOLFILE
382  
383   # rootthread toolfile
384 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread
385 < <doc type=BuildSystem::ToolDoc version=1.0>
386 < <Tool name=rootthread version=%v>
387 < <info url="http://root.cern.ch/root/"></info>
388 < <lib name=Thread>
292 < <use name=ROOTCore>
293 < </Tool>
384 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread.xml
385 >  <tool name="rootthread" version="%v">
386 >    <info url="http://root.cern.ch/root/"/>
387 >    <use name="ROOTCore"/>
388 >  </tool>
389   EOF_TOOLFILE
390  
391   %post
392 < %{relocateConfig}etc/scram.d/root
298 < %{relocateConfig}etc/scram.d/rootcore
299 < %{relocateConfig}etc/scram.d/rootcintex
300 < %{relocateConfig}etc/scram.d/rootinteractive
301 < %{relocateConfig}etc/scram.d/rootmath
302 < %{relocateConfig}etc/scram.d/rootminuit
303 < %{relocateConfig}etc/scram.d/rootminuit2
304 < %{relocateConfig}etc/scram.d/rootrflx
305 < %{relocateConfig}etc/scram.d/roothtml
306 < %{relocateConfig}etc/scram.d/rootroofit
307 < %{relocateConfig}etc/scram.d/rootmlp
308 < %{relocateConfig}etc/scram.d/roottmva
309 < %{relocateConfig}etc/scram.d/rootthread
392 > 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