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.78 by ratnik, Mon Nov 5 20:18:05 2007 UTC vs.
Revision 1.100 by dlange, Sat Feb 23 18:26:19 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS11
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
13 < Patch6: root_Reflex_Cintex
14 < Patch7: root_CallFunc
15 < Patch8: root-proofd
7 > Patch0: root-5.18-00-libpng
8 > Patch1: root-5.18-00-CINT-maxlongline-maxtypedef
9 > Patch2: root_5.18-00-CINTFunctional
10  
11   %define cpu %(echo %cmsplatf | cut -d_ -f2)
12   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 35 | Line 29 | Requires: libtiff
29  
30   %prep
31   %setup -n root
32 < %patch -p0
33 < %patch1 -p2
34 < %patch2 -p2
35 < %patch3 -p1
42 < %patch4 -p0
43 < %patch5 -p1
44 < %patch6 -p0
45 < %patch7 -p0
46 < %patch8 -p1
32 > %patch0 -p1
33 > %patch1 -p1
34 > %patch2 -p0
35 >
36   %build
37   mkdir -p %i
38   export ROOTSYS=%_builddir/root
39  
40 < %if "%{?online_release:set}" != "set"
40 > %if "%{?online_release:set}" == "set"
41 > # Use oracle from xdaq installation:
42 > ORACLE_ROOT="/opt/xdaq"
43 > # Build without mysql, and use system qt and openssl:
44   EXTRA_CONFIG_ARGS="
45 < --with-xrootd=$XROOTD_ROOT
46 < --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
47 < --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
48 < --with-ssl-incdir=${OPENSSL_ROOT}/include
57 < --with-ssl-libdir=${OPENSSL_ROOT}/lib"
45 >             --disable-mysql
46 >             --enable-qt
47 >             --enable-ssl"
48 > # Also skip xrootd option for online case.
49   %else
50 < ORACLE_ROOT="/opt/xdaq"
51 < EXTRA_CONFIG_ARGS="--disable-mysql --enable-ssl"
50 > EXTRA_CONFIG_ARGS="
51 >             --with-xrootd=$XROOTD_ROOT
52 >             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
53 >             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
54 >             --with-ssl-incdir=${OPENSSL_ROOT}/include
55 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
56   %endif
57  
58   CONFIG_ARGS="--enable-table
# Line 65 | Line 60 | CONFIG_ARGS="--enable-table
60               --disable-builtin-freetype
61               --disable-builtin-zlib
62               --with-gccxml=${GCCXML_ROOT}
63 <             --enable-python
69 <             --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
63 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
64               --enable-explicitlink
65               --enable-qtgsi
72             --enable-qt
66               --enable-mathcore
67               --enable-mathmore
68               --enable-reflex  
# Line 85 | Line 78 | CONFIG_ARGS="--enable-table
78               --disable-pgsql
79               --disable-xml ${EXTRA_CONFIG_ARGS}"
80  
81 + %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
82 +  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
83 + %endif
84 +
85   case $(uname)-$(uname -p) in
86    Linux-x86_64)
87      ./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 125 | Line 122 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
122   <info url="http://root.cern.ch/root/"></info>
123   <lib name=Cint>
124   <lib name=Core>
125 + <lib name=RIO>
126 + <lib name=Net>
127   <lib name=Tree>
128   <Client>
129   <Environment name=ROOTCORE_BASE default="%i"></Environment>
# Line 249 | Line 248 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
248   <doc type=BuildSystem::ToolDoc version=1.0>
249   <Tool name=rootroofit version=%v>
250   <info url="http://root.cern.ch/root/"></info>
251 + <lib name=RooFitCore>
252   <lib name=RooFit>
253   <use name=ROOTMinuit>
254   <use name=ROOTHtml>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines