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.75 by ratnik, Tue Oct 16 08:38:00 2007 UTC vs.
Revision 1.106 by ratnik, Fri Mar 7 23:44:06 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS9
1 > ### RPM lcg root 5.18.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
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 < Patch: root-CINT-maxlongline
8 < Patch1: root_libpng
9 < Patch2: root_PositionVector
10 < Patch3: root-fastmerge-ttree
11 < Patch4: root_TXMLSetup
12 < Patch5: root-Cintex
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  
12   %define cpu %(echo %cmsplatf | cut -d_ -f2)
13   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 17 | Line 15 | Patch5: root-Cintex
15   Requires: gccxml gsl castor libjpg dcap pcre python
16  
17   %if "%{?online_release:set}" != "set"
18 < Requires: qt openssl mysql libpng zlib oracle libungif
18 > Requires: qt openssl mysql libpng zlib oracle libungif xrootd
19   %else
20   %define skiplibtiff true
21   %endif
# Line 32 | Line 30 | Requires: libtiff
30  
31   %prep
32   %setup -n root
33 < %patch -p0
34 < %patch1 -p2
35 < %patch2 -p2
33 > %patch0 -p1
34 > %patch1 -p1
35 > %patch2 -p0
36   %patch3 -p1
37 < %patch4 -p0
40 < %patch5 -p1
37 >
38   %build
39   mkdir -p %i
40   export ROOTSYS=%_builddir/root
41  
42 < %if "%{?online_release:set}" != "set"
42 > %if "%{?online_release:set}" == "set"
43 > # Use oracle from xdaq installation:
44 > ORACLE_ROOT="/opt/xdaq"
45 > # Build without mysql, and use system qt and openssl:
46   EXTRA_CONFIG_ARGS="
47 < --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
48 < --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
49 < --with-ssl-incdir=${OPENSSL_ROOT}/include
50 < --with-ssl-libdir=${OPENSSL_ROOT}/lib"
47 >             --disable-mysql
48 >             --enable-qt
49 >             --enable-ssl"
50 > # Also skip xrootd option for online case.
51   %else
52 < ORACLE_ROOT="/opt/xdaq"
53 < EXTRA_CONFIG_ARGS=" --enable-ssl"
52 > EXTRA_CONFIG_ARGS="
53 >             --with-xrootd=$XROOTD_ROOT
54 >             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
55 >             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
56 >             --with-ssl-incdir=${OPENSSL_ROOT}/include
57 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
58   %endif
59  
60   CONFIG_ARGS="--enable-table
# Line 58 | Line 62 | CONFIG_ARGS="--enable-table
62               --disable-builtin-freetype
63               --disable-builtin-zlib
64               --with-gccxml=${GCCXML_ROOT}
65 <             --enable-python
62 <             --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
63 <             --enable-mysql
65 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
66               --enable-explicitlink
67               --enable-qtgsi
66 –             --enable-qt
68               --enable-mathcore
69               --enable-mathmore
70               --enable-reflex  
# Line 79 | Line 80 | CONFIG_ARGS="--enable-table
80               --disable-pgsql
81               --disable-xml ${EXTRA_CONFIG_ARGS}"
82  
83 + %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
84 +  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
85 + %endif
86 +
87   case $(uname)-$(uname -p) in
88    Linux-x86_64)
89      ./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;;
# Line 119 | Line 124 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
124   <info url="http://root.cern.ch/root/"></info>
125   <lib name=Cint>
126   <lib name=Core>
127 + <lib name=RIO>
128 + <lib name=Net>
129   <lib name=Tree>
130   <Client>
131   <Environment name=ROOTCORE_BASE default="%i"></Environment>
# Line 243 | Line 250 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
250   <doc type=BuildSystem::ToolDoc version=1.0>
251   <Tool name=rootroofit version=%v>
252   <info url="http://root.cern.ch/root/"></info>
253 + <lib name=RooFitCore>
254   <lib name=RooFit>
255   <use name=ROOTMinuit>
256   <use name=ROOTHtml>

Diff Legend

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