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.73 by dlange, Mon Oct 15 12:31:04 2007 UTC vs.
Revision 1.78 by ratnik, Mon Nov 5 20:18:05 2007 UTC

# Line 16 | Line 16 | Patch8: root-proofd
16  
17   %define cpu %(echo %cmsplatf | cut -d_ -f2)
18   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
19 Requires: gccxml python qt gsl castor openssl mysql libpng libjpg dcap pcre zlib oracle libungif xrootd
19  
20 < %if "%cpu" != "amd64"
20 > Requires: gccxml gsl castor libjpg dcap pcre python
21 >
22 > %if "%{?online_release:set}" != "set"
23 > Requires: qt openssl mysql libpng zlib oracle libungif xrootd
24 > %else
25 > %define skiplibtiff true
26 > %endif
27 >
28 > %if "%cpu" == "amd64"
29 > %define skiplibtiff true
30 > %endif
31 >
32 > %if "%skiplibtiff" != "true"
33   Requires: libtiff
34   %endif
35  
# Line 33 | Line 44 | Requires: libtiff
44   %patch6 -p0
45   %patch7 -p0
46   %patch8 -p1
36
47   %build
48   mkdir -p %i
49   export ROOTSYS=%_builddir/root
50 +
51 + %if "%{?online_release:set}" != "set"
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 + --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 + %else
59 + ORACLE_ROOT="/opt/xdaq"
60 + EXTRA_CONFIG_ARGS="--disable-mysql --enable-ssl"
61 + %endif
62 +
63   CONFIG_ARGS="--enable-table
64               --disable-builtin-pcre
65               --disable-builtin-freetype
66               --disable-builtin-zlib
67               --with-gccxml=${GCCXML_ROOT}
68 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
69 <             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
68 >             --enable-python
69 >             --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
70               --enable-explicitlink
71               --enable-qtgsi
72 <             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
72 >             --enable-qt
73               --enable-mathcore
74               --enable-mathmore
75               --enable-reflex  
# Line 55 | Line 78 | CONFIG_ARGS="--enable-table
78               --enable-roofit
79               --disable-ldap
80               --disable-krb5
58             --with-ssl-incdir=${OPENSSL_ROOT}/include
59             --with-ssl-libdir=${OPENSSL_ROOT}/lib
81               --with-gsl-incdir=${GSL_ROOT}/include
82               --with-gsl-libdir=${GSL_ROOT}/lib
83               --with-dcap-libdir=${DCAP_ROOT}/lib
84               --with-dcap-incdir=${DCAP_ROOT}/include
64             --with-xrootd=$XROOTD_ROOT
85               --disable-pgsql
86 <             --disable-xml"
86 >             --disable-xml ${EXTRA_CONFIG_ARGS}"
87  
88   case $(uname)-$(uname -p) in
89    Linux-x86_64)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines