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.157 by dlange, Tue May 5 03:19:51 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
7 > Patch0:  root-5.18-00-libpng
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 > Patch10: root-5.22-00a-TMVA-just-shut-the-hell-up
18 > Patch11: root-5.22-00a-th1
19 > Patch12: root-5.22-00a-smatrix
20 > Patch13: root-5.22-00a-fireworks1
21 > Patch14: root-5.22-00a-Reflex-gendict_selclass
22 > Patch15: root-5.22-00a-MatrixInversion
23  
24   %define cpu %(echo %cmsplatf | cut -d_ -f2)
25   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 41 | Line 44 | Requires: libtiff
44   %setup -n root
45   %patch0 -p1
46   %patch1 -p1
47 < %patch2 -p0
47 > %patch2 -p1
48   %patch3 -p1
49 < %patch4 -p0
50 < %patch5 -p0
51 < %patch6 -p0
49 > %patch4 -p1
50 > %patch5 -p1
51 > %patch6 -p1
52   %patch7 -p0
53 < %patch8 -p1
54 < %patch9 -p0
55 < %patch10 -p0
56 < %patch11 -p0
53 > %patch8 -p0
54 > %patch9 -p1
55 > %patch10 -p1
56 > %patch11 -p1
57   %patch12 -p1
58 <
58 > %patch13 -p1
59 > %patch14 -p0
60 > %patch15 -p0
61 >
62   %build
63   mkdir -p %i
64   export ROOTSYS=%_builddir/root
# Line 75 | Line 81 | EXTRA_CONFIG_ARGS="
81               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
82   %endif
83  
84 < CONFIG_ARGS="--enable-table
84 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
85 >             --enable-table
86               --disable-builtin-pcre
87               --disable-builtin-freetype
88               --disable-builtin-zlib
# Line 83 | Line 90 | CONFIG_ARGS="--enable-table
90               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
91               --enable-explicitlink
92               --enable-qtgsi
86 –             --enable-mathcore
93               --enable-mathmore
94               --enable-reflex  
95               --enable-cintex
# Line 98 | Line 104 | CONFIG_ARGS="--enable-table
104               --disable-pgsql
105               --disable-xml ${EXTRA_CONFIG_ARGS}"
106  
107 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
108 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
109 < %endif
107 > #case %gccver in
108 > #  4.*)
109 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
110 > #  ;;
111 > #esac
112  
113   case $(uname)-$(uname -p) in
114    Linux-x86_64)
115 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
115 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
116    Linux-i*86)
117      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
118    Darwin*)
# Line 113 | Line 121 | case $(uname)-$(uname -p) in
121      ./configure linux $CONFIG_ARGS --disable-rfio;;
122   esac
123  
124 < make  %makeprocesses
124 > case %cmsplatf in
125 >  osx*)
126 >   makeopts=
127 >  ;;
128 >  *)
129 >   makeopts="%makeprocesses"
130 >  ;;
131 > esac
132 >
133 > make $makeopts
134   make cintdlls
135 +
136   %install
137   # Override installers if we are using GNU fileutils cp.  On OS X
138   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 130 | Line 148 | fi
148   export ROOTSYS=%i
149   make INSTALL="$cp" INSTALLDATA="$cp" install
150   mkdir -p $ROOTSYS/lib/python
151 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
151 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
152   #
153  
154   # SCRAM ToolBox toolfile
# Line 140 | Line 158 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
158   <doc type=BuildSystem::ToolDoc version=1.0>
159   <Tool name=rootcore version=%v>
160   <info url="http://root.cern.ch/root/"></info>
143 – <lib name=Cint>
144 – <lib name=Core>
145 – <lib name=RIO>
146 – <lib name=Net>
161   <lib name=Tree>
162 + <lib name=Net>
163 + <lib name=Thread>
164 + <lib name=MathCore>
165 + <lib name=RIO>
166 + <lib name=Core>
167 + <lib name=Cint>
168   <Client>
169   <Environment name=ROOTCORE_BASE default="%i"></Environment>
170   <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
# Line 174 | Line 194 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
194   <doc type=BuildSystem::ToolDoc version=1.0>
195   <Tool name=roothistmatrix version=%v>
196   <info url="http://root.cern.ch/root/"></info>
197 + <lib name=Gpad>
198 + <lib name=Graf>
199   <lib name=Hist>
200   <lib name=Matrix>
201   <use name=ROOTCore>
# Line 196 | Line 218 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
218   <Tool name=rootgraphics version=%v>
219   <info url="http://root.cern.ch/root/"></info>
220   <lib name=TreePlayer>
199 – <lib name=Gpad>
221   <lib name=Graf3d>
201 – <lib name=Graf>
202 – <lib name=Hist>
203 – <lib name=Matrix>
204 – <lib name=Physics>
222   <lib name=Postscript>
223 < <use name=ROOTCore>
223 > <use name=ROOTPhysics>
224   </Tool>
225   EOF_TOOLFILE
226  
# Line 218 | Line 235 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
235   </Tool>
236   EOF_TOOLFILE
237  
238 < # rootinteractive toolfile
238 > # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
239 > # have been removed for the moment)
240   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
241   <doc type=BuildSystem::ToolDoc version=1.0>
242   <Tool name=rootinteractive version=%v>
243   <info url="http://root.cern.ch/root/"></info>
244   <lib name=Rint>
245   <lib name=GQt>
246 + <lib name=Gui>
247   <use name=qt>
248   <use name=libjpg>
249   <use name=libpng>
# Line 237 | Line 256 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
256   <doc type=BuildSystem::ToolDoc version=1.0>
257   <Tool name=rootmath version=%v>
258   <info url="http://root.cern.ch/root/"></info>
259 < <lib name=MathCore>
259 > <lib name=GenVector>
260   <lib name=MathMore>
261   <use name=ROOTCore>
262   <use name=gsl>
# Line 289 | Line 308 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
308   <Tool name=roothtml version=%v>
309   <info url="http://root.cern.ch/root/"></info>
310   <lib name=Html>
311 < <use name=ROOT>
311 > <use name=RootHistMatrix>
312   </Tool>
313   EOF_TOOLFILE
314  
# Line 298 | Line 317 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
317   <doc type=BuildSystem::ToolDoc version=1.0>
318   <Tool name=rootroofit version=%v>
319   <info url="http://root.cern.ch/root/"></info>
301 – <lib name=RooFitCore>
320   <lib name=RooFit>
321 + <lib name=RooFitCore>
322   <use name=ROOTMinuit>
323   <use name=ROOTHtml>
324   </Tool>
# Line 311 | Line 330 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
330   <Tool name=rootmlp version=%v>
331   <info url="http://root.cern.ch/root/"></info>
332   <lib name=MLP>
333 < <use name=ROOT>
333 > <use name=RootGraphics>
334   </Tool>
335   EOF_TOOLFILE
336  
# Line 330 | Line 349 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
349   <doc type=BuildSystem::ToolDoc version=1.0>
350   <Tool name=rootthread version=%v>
351   <info url="http://root.cern.ch/root/"></info>
333 – <lib name=Thread>
352   <use name=ROOTCore>
353   </Tool>
354   EOF_TOOLFILE

Diff Legend

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