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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines