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.116 by ratnik, Thu Apr 24 17:48:44 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.18.00a
1 > ### RPM lcg root 5.18.00a-200onl2
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
# 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 <
12 > Patch5: root-5.18-00a-Cintex2
13 > Patch6: root-5.18-00a-TBufferFile
14  
15   %define cpu %(echo %cmsplatf | cut -d_ -f2)
16   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# 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 + %patch6 -p0
43  
44   %build
45   mkdir -p %i
46   export ROOTSYS=%_builddir/root
47  
48   %if "%{?online_release:set}" == "set"
49 < # Use oracle from xdaq installation:
50 < ORACLE_ROOT="/opt/xdaq"
51 < # Build without mysql, and use system qt and openssl:
49 > # Build without mysql, and use system qt.
50 > # Also skip xrootd and odbc for online case:
51 >
52   EXTRA_CONFIG_ARGS="
53 <             --disable-mysql
54 <             --enable-qt
55 <             --enable-ssl"
56 < # Also skip xrootd option for online case.
53 >             --disable-mysql
54 >             --disable-xrootd
55 >             --disable-odbc
56 >             --enable-qt"
57   %else
58   EXTRA_CONFIG_ARGS="
59               --with-xrootd=$XROOTD_ROOT
# Line 89 | Line 92 | CONFIG_ARGS="--enable-table
92  
93   case $(uname)-$(uname -p) in
94    Linux-x86_64)
95 <    ./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;;
95 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
96    Linux-i*86)
97 <    ./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;;
97 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
98    Darwin*)
99      ./configure macosx $CONFIG_ARGS --disable-rfio;;
100    Linux-ppc64*)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines