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.111 by ratnik, Mon Apr 7 21:01:51 2008 UTC

# Line 9 | Line 9 | 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  
14  
15   %define cpu %(echo %cmsplatf | cut -d_ -f2)
# Line 17 | Line 18 | Patch4: root-5.18-00a-Cintex
18   Requires: gccxml gsl castor libjpg dcap pcre python
19  
20   %if "%{?online_release:set}" != "set"
21 < Requires: qt openssl mysql libpng zlib oracle libungif xrootd
21 > Requires: qt openssl mysql libpng zlib libungif xrootd
22   %else
23   %define skiplibtiff true
24   %endif
# Line 37 | Line 38 | Requires: libtiff
38   %patch2 -p0
39   %patch3 -p1
40   %patch4 -p0
41 + %patch5 -p0
42  
43   %build
44   mkdir -p %i
45   export ROOTSYS=%_builddir/root
46  
47   %if "%{?online_release:set}" == "set"
48 < # Use oracle from xdaq installation:
49 < ORACLE_ROOT="/opt/xdaq"
50 < # Build without mysql, and use system qt and openssl:
48 > # Build without mysql, and use system qt.
49 > # Also skip xrootd and odbc for online case:
50 >
51   EXTRA_CONFIG_ARGS="
52 <             --disable-mysql
53 <             --enable-qt
54 <             --enable-ssl"
55 < # Also skip xrootd option for online case.
52 >             --disable-mysql
53 >             --disable-xrootd
54 >             --disable-odbc
55 >             --enable-qt"
56   %else
57   EXTRA_CONFIG_ARGS="
58               --with-xrootd=$XROOTD_ROOT
# Line 89 | Line 91 | CONFIG_ARGS="--enable-table
91  
92   case $(uname)-$(uname -p) in
93    Linux-x86_64)
94 <    ./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;;
94 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
95    Linux-i*86)
96 <    ./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;;
96 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
97    Darwin*)
98      ./configure macosx $CONFIG_ARGS --disable-rfio;;
99    Linux-ppc64*)

Diff Legend

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