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.128 by elmer, Tue Dec 16 01:51:29 2008 UTC vs.
Revision 1.153 by muzaffar, Wed Apr 8 07:04:44 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.18.00a
1 > ### RPM lcg root 5.22.00a
2   ## INITENV +PATH PYTHONPATH %i/lib/python
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  
7   Patch0:  root-5.18-00-libpng
8 < Patch1:  root-5.18-00a-CINT-maxlongline
9 < Patch2:  root_5.18-00-CINTFunctional
10 < 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 < Patch10: root-5.18-00a-TFile-stlStreamerInfo
18 < Patch11: root-5.18-00-cintex_functional_mmap
19 < Patch12: root-5.18-00a-TMVA-fSilent
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
11 > Patch4:  root-5.22-00a-CINTFunctional
12 > Patch5:  root-5.22-00a-TClass
13 > Patch6:  root-5.22-00a-fireworks-graf3d-gui
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  
18   %define cpu %(echo %cmsplatf | cut -d_ -f2)
19   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 41 | Line 38 | Requires: libtiff
38   %setup -n root
39   %patch0 -p1
40   %patch1 -p1
41 < %patch2 -p0
41 > %patch2 -p1
42   %patch3 -p1
43 < %patch4 -p0
44 < %patch5 -p0
45 < %patch6 -p0
49 < %patch7 -p0
50 < %patch8 -p1
51 < %patch9 -p0
52 < %patch10 -p0
53 < %patch11 -p0
54 < %patch12 -p1
43 > %patch4 -p1
44 > %patch5 -p1
45 > %patch6 -p1
46  
47   %build
48   mkdir -p %i
# Line 75 | Line 66 | EXTRA_CONFIG_ARGS="
66               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
67   %endif
68  
69 < CONFIG_ARGS="--enable-table
69 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
70 >             --enable-table
71               --disable-builtin-pcre
72               --disable-builtin-freetype
73               --disable-builtin-zlib
# Line 83 | Line 75 | CONFIG_ARGS="--enable-table
75               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
76               --enable-explicitlink
77               --enable-qtgsi
86 –             --enable-mathcore
78               --enable-mathmore
79               --enable-reflex  
80               --enable-cintex
# Line 98 | Line 89 | CONFIG_ARGS="--enable-table
89               --disable-pgsql
90               --disable-xml ${EXTRA_CONFIG_ARGS}"
91  
92 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
93 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
94 < %endif
92 > #case %gccver in
93 > #  4.*)
94 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
95 > #  ;;
96 > #esac
97  
98   case $(uname)-$(uname -p) in
99    Linux-x86_64)
100 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
100 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
101    Linux-i*86)
102      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
103    Darwin*)
# Line 113 | Line 106 | case $(uname)-$(uname -p) in
106      ./configure linux $CONFIG_ARGS --disable-rfio;;
107   esac
108  
109 < make  %makeprocesses
109 > case %cmsplatf in
110 >  osx*)
111 >   makeopts=
112 >  ;;
113 >  *)
114 >   makeopts="%makeprocesses"
115 >  ;;
116 > esac
117 >
118 > make $makeopts
119   make cintdlls
120 +
121   %install
122   # Override installers if we are using GNU fileutils cp.  On OS X
123   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 130 | Line 133 | fi
133   export ROOTSYS=%i
134   make INSTALL="$cp" INSTALLDATA="$cp" install
135   mkdir -p $ROOTSYS/lib/python
136 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
136 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
137   #
138  
139   # SCRAM ToolBox toolfile
# Line 140 | Line 143 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
143   <doc type=BuildSystem::ToolDoc version=1.0>
144   <Tool name=rootcore version=%v>
145   <info url="http://root.cern.ch/root/"></info>
143 – <lib name=Cint>
144 – <lib name=Core>
145 – <lib name=RIO>
146 – <lib name=Net>
146   <lib name=Tree>
147 + <lib name=Net>
148 + <lib name=Thread>
149 + <lib name=MathCore>
150 + <lib name=RIO>
151 + <lib name=Core>
152 + <lib name=Cint>
153   <Client>
154   <Environment name=ROOTCORE_BASE default="%i"></Environment>
155   <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
# Line 174 | Line 179 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
179   <doc type=BuildSystem::ToolDoc version=1.0>
180   <Tool name=roothistmatrix version=%v>
181   <info url="http://root.cern.ch/root/"></info>
182 + <lib name=Gpad>
183 + <lib name=Graf>
184   <lib name=Hist>
185   <lib name=Matrix>
186   <use name=ROOTCore>
# Line 196 | Line 203 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
203   <Tool name=rootgraphics version=%v>
204   <info url="http://root.cern.ch/root/"></info>
205   <lib name=TreePlayer>
199 – <lib name=Gpad>
206   <lib name=Graf3d>
201 – <lib name=Graf>
202 – <lib name=Hist>
203 – <lib name=Matrix>
204 – <lib name=Physics>
207   <lib name=Postscript>
208 < <use name=ROOTCore>
208 > <use name=ROOTPhysics>
209   </Tool>
210   EOF_TOOLFILE
211  
# Line 218 | Line 220 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
220   </Tool>
221   EOF_TOOLFILE
222  
223 < # rootinteractive toolfile
223 > # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
224 > # have been removed for the moment)
225   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
226   <doc type=BuildSystem::ToolDoc version=1.0>
227   <Tool name=rootinteractive version=%v>
228   <info url="http://root.cern.ch/root/"></info>
229   <lib name=Rint>
227 – <lib name=GQt>
228 – <use name=qt>
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>
241 + <lib name=GQt>
242 + <lib name=Gui>
243 + <use name=qt>
244 + <use name=RootInteractive>
245 + </Tool>
246 + EOF_TOOLFILE
247 +
248 +
249   # rootmath toolfile
250   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
251   <doc type=BuildSystem::ToolDoc version=1.0>
252   <Tool name=rootmath version=%v>
253   <info url="http://root.cern.ch/root/"></info>
254 < <lib name=MathCore>
254 > <lib name=GenVector>
255   <lib name=MathMore>
256   <use name=ROOTCore>
257   <use name=gsl>
# Line 289 | Line 303 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
303   <Tool name=roothtml version=%v>
304   <info url="http://root.cern.ch/root/"></info>
305   <lib name=Html>
306 < <use name=ROOT>
306 > <use name=RootHistMatrix>
307   </Tool>
308   EOF_TOOLFILE
309  
# Line 298 | Line 312 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
312   <doc type=BuildSystem::ToolDoc version=1.0>
313   <Tool name=rootroofit version=%v>
314   <info url="http://root.cern.ch/root/"></info>
301 – <lib name=RooFitCore>
315   <lib name=RooFit>
316 + <lib name=RooFitCore>
317   <use name=ROOTMinuit>
318   <use name=ROOTHtml>
319   </Tool>
# Line 311 | Line 325 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
325   <Tool name=rootmlp version=%v>
326   <info url="http://root.cern.ch/root/"></info>
327   <lib name=MLP>
328 < <use name=ROOT>
328 > <use name=RootGraphics>
329   </Tool>
330   EOF_TOOLFILE
331  
# Line 330 | Line 344 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
344   <doc type=BuildSystem::ToolDoc version=1.0>
345   <Tool name=rootthread version=%v>
346   <info url="http://root.cern.ch/root/"></info>
333 – <lib name=Thread>
347   <use name=ROOTCore>
348   </Tool>
349   EOF_TOOLFILE

Diff Legend

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