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.103 by dlange, Tue Mar 4 21:17:11 2008 UTC vs.
Revision 1.117 by ratnik, Tue May 13 17:18:11 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines