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.125 by elmer, Tue Oct 28 13:00:24 2008 UTC

# Line 4 | Line 4
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 <
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  
20   %define cpu %(echo %cmsplatf | cut -d_ -f2)
21   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
22  
23   Requires: gccxml gsl castor libjpg dcap pcre python
24  
25 < %if "%{?online_release:set}" != "set"
26 < Requires: qt openssl mysql libpng zlib oracle libungif xrootd
25 > %if "%cmsplatf" != "slc4onl_ia32_gcc346"
26 > Requires: qt openssl mysql libpng zlib libungif xrootd
27   %else
28   %define skiplibtiff true
29   %endif
# Line 37 | Line 43 | Requires: libtiff
43   %patch2 -p0
44   %patch3 -p1
45   %patch4 -p0
46 + %patch5 -p0
47 + %patch6 -p0
48 + %patch7 -p0
49 + %patch8 -p1
50 + %patch9 -p0
51 + %patch10 -p0
52 + %patch11 -p0
53  
54   %build
55   mkdir -p %i
56   export ROOTSYS=%_builddir/root
57  
58 < %if "%{?online_release:set}" == "set"
59 < # Use oracle from xdaq installation:
60 < ORACLE_ROOT="/opt/xdaq"
61 < # Build without mysql, and use system qt and openssl:
58 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
59 > # Build without mysql, and use system qt.
60 > # Also skip xrootd and odbc for online case:
61 >
62   EXTRA_CONFIG_ARGS="
63 <             --disable-mysql
64 <             --enable-qt
65 <             --enable-ssl"
66 < # Also skip xrootd option for online case.
63 >             --disable-mysql
64 >             --disable-xrootd
65 >             --disable-odbc
66 >             --enable-qt"
67   %else
68   EXTRA_CONFIG_ARGS="
69               --with-xrootd=$XROOTD_ROOT
# Line 89 | Line 102 | CONFIG_ARGS="--enable-table
102  
103   case $(uname)-$(uname -p) in
104    Linux-x86_64)
105 <    ./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;;
105 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
106    Linux-i*86)
107 <    ./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;;
107 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
108    Darwin*)
109      ./configure macosx $CONFIG_ARGS --disable-rfio;;
110    Linux-ppc64*)
# Line 145 | Line 158 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
158   </Tool>
159   EOF_TOOLFILE
160  
161 < # root toolfile
161 > # root toolfile, alias for rootphysics. Using rootphysics is preferred.
162   cat << \EOF_TOOLFILE >%i/etc/scram.d/root
163   <doc type=BuildSystem::ToolDoc version=1.0>
164   <Tool name=root version=%v>
165   <info url="http://root.cern.ch/root/"></info>
166 + <use name=rootphysics>
167 + </Tool>
168 + EOF_TOOLFILE
169 +
170 + # roothistmatrix toolfile
171 + cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix
172 + <doc type=BuildSystem::ToolDoc version=1.0>
173 + <Tool name=roothistmatrix version=%v>
174 + <info url="http://root.cern.ch/root/"></info>
175 + <lib name=Hist>
176 + <lib name=Matrix>
177 + <use name=ROOTCore>
178 + </Tool>
179 + EOF_TOOLFILE
180 +
181 + # rootphysics toolfile
182 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
183 + <doc type=BuildSystem::ToolDoc version=1.0>
184 + <Tool name=rootphysics version=%v>
185 + <info url="http://root.cern.ch/root/"></info>
186 + <lib name=Physics>
187 + <use name=roothistmatrix>
188 + </Tool>
189 + EOF_TOOLFILE
190 +
191 + # rootgraphics toolfile, identical to old "root" toolfile
192 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics
193 + <doc type=BuildSystem::ToolDoc version=1.0>
194 + <Tool name=rootgraphics version=%v>
195 + <info url="http://root.cern.ch/root/"></info>
196   <lib name=TreePlayer>
197   <lib name=Gpad>
198   <lib name=Graf3d>
# Line 293 | Line 336 | EOF_TOOLFILE
336   %post
337   %{relocateConfig}etc/scram.d/root
338   %{relocateConfig}etc/scram.d/rootcore
339 + %{relocateConfig}etc/scram.d/roothistmatrix
340 + %{relocateConfig}etc/scram.d/rootphysics
341 + %{relocateConfig}etc/scram.d/rootgraphics
342   %{relocateConfig}etc/scram.d/rootcintex
343   %{relocateConfig}etc/scram.d/rootinteractive
344   %{relocateConfig}etc/scram.d/rootmath

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines