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.111 by ratnik, Mon Apr 7 21:01:51 2008 UTC vs.
Revision 1.130 by elmer, Tue Jan 13 19:44:39 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.18.00a
1 > ### RPM lcg root 5.22.00
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 <
7 > Patch0:  root-5.18-00-libpng
8 > Patch1:  root-5.21-04-CINT-maxlongline
9  
10   %define cpu %(echo %cmsplatf | cut -d_ -f2)
11   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
12  
13   Requires: gccxml gsl castor libjpg dcap pcre python
14  
15 < %if "%{?online_release:set}" != "set"
16 < Requires: qt openssl mysql libpng zlib libungif xrootd
15 > %if "%cmsplatf" != "slc4onl_ia32_gcc346"
16 > Requires: qt openssl mysql libpng zlib libungif
17   %else
18   %define skiplibtiff true
19   %endif
# Line 35 | Line 30 | Requires: libtiff
30   %setup -n root
31   %patch0 -p1
32   %patch1 -p1
38 – %patch2 -p0
39 – %patch3 -p1
40 – %patch4 -p0
41 – %patch5 -p0
33  
34   %build
35   mkdir -p %i
36   export ROOTSYS=%_builddir/root
37  
38 < %if "%{?online_release:set}" == "set"
38 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
39   # Build without mysql, and use system qt.
40   # Also skip xrootd and odbc for online case:
41  
# Line 55 | Line 46 | EXTRA_CONFIG_ARGS="
46               --enable-qt"
47   %else
48   EXTRA_CONFIG_ARGS="
58 –             --with-xrootd=$XROOTD_ROOT
49               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
50               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
51               --with-ssl-incdir=${OPENSSL_ROOT}/include
52               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
53   %endif
54  
55 < CONFIG_ARGS="--enable-table
55 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
56 >             --enable-table
57               --disable-builtin-pcre
58               --disable-builtin-freetype
59               --disable-builtin-zlib
# Line 70 | Line 61 | CONFIG_ARGS="--enable-table
61               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
62               --enable-explicitlink
63               --enable-qtgsi
73 –             --enable-mathcore
64               --enable-mathmore
65               --enable-reflex  
66               --enable-cintex
# Line 85 | Line 75 | CONFIG_ARGS="--enable-table
75               --disable-pgsql
76               --disable-xml ${EXTRA_CONFIG_ARGS}"
77  
78 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
79 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
80 < %endif
78 > #case %gccver in
79 > #  4.*)
80 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
81 > #  ;;
82 > #esac
83  
84   case $(uname)-$(uname -p) in
85    Linux-x86_64)
# Line 117 | Line 109 | fi
109   export ROOTSYS=%i
110   make INSTALL="$cp" INSTALLDATA="$cp" install
111   mkdir -p $ROOTSYS/lib/python
112 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
112 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
113   #
114  
115   # SCRAM ToolBox toolfile
# Line 147 | Line 139 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
139   </Tool>
140   EOF_TOOLFILE
141  
142 < # root toolfile
142 > # root toolfile, alias for rootphysics. Using rootphysics is preferred.
143   cat << \EOF_TOOLFILE >%i/etc/scram.d/root
144   <doc type=BuildSystem::ToolDoc version=1.0>
145   <Tool name=root version=%v>
146   <info url="http://root.cern.ch/root/"></info>
147 + <use name=rootphysics>
148 + </Tool>
149 + EOF_TOOLFILE
150 +
151 + # roothistmatrix toolfile
152 + cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix
153 + <doc type=BuildSystem::ToolDoc version=1.0>
154 + <Tool name=roothistmatrix version=%v>
155 + <info url="http://root.cern.ch/root/"></info>
156 + <lib name=Hist>
157 + <lib name=Matrix>
158 + <use name=ROOTCore>
159 + </Tool>
160 + EOF_TOOLFILE
161 +
162 + # rootphysics toolfile
163 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
164 + <doc type=BuildSystem::ToolDoc version=1.0>
165 + <Tool name=rootphysics version=%v>
166 + <info url="http://root.cern.ch/root/"></info>
167 + <lib name=Physics>
168 + <use name=roothistmatrix>
169 + </Tool>
170 + EOF_TOOLFILE
171 +
172 + # rootgraphics toolfile, identical to old "root" toolfile
173 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics
174 + <doc type=BuildSystem::ToolDoc version=1.0>
175 + <Tool name=rootgraphics version=%v>
176 + <info url="http://root.cern.ch/root/"></info>
177   <lib name=TreePlayer>
178   <lib name=Gpad>
179   <lib name=Graf3d>
# Line 196 | Line 218 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
218   <info url="http://root.cern.ch/root/"></info>
219   <lib name=MathCore>
220   <lib name=MathMore>
221 + <lib name=GenVector>
222   <use name=ROOTCore>
223   <use name=gsl>
224   </Tool>
# Line 295 | Line 318 | EOF_TOOLFILE
318   %post
319   %{relocateConfig}etc/scram.d/root
320   %{relocateConfig}etc/scram.d/rootcore
321 + %{relocateConfig}etc/scram.d/roothistmatrix
322 + %{relocateConfig}etc/scram.d/rootphysics
323 + %{relocateConfig}etc/scram.d/rootgraphics
324   %{relocateConfig}etc/scram.d/rootcintex
325   %{relocateConfig}etc/scram.d/rootinteractive
326   %{relocateConfig}etc/scram.d/rootmath

Diff Legend

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