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.49 by sashby, Thu Dec 14 10:59:06 2006 UTC vs.
Revision 1.55 by ratnik, Wed Apr 18 23:46:02 2007 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.13.04e
1 > ### RPM lcg root 5.14.00d-pCMS1
2 > Requires: gcc-wrapper
3   # INITENV +PATH PYTHONPATH %i/lib/python
4   %define realVersion %(echo %v | cut -d- -f1)
5   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
6   #Source: ftp://root.cern.ch/%n/%{n}_v%{realVersion}.source.tar.gz
7 +
8 + Patch: root-CINT-maxtypedef
9 +
10   %define cpu %(echo %cmsplatf | cut -d_ -f2)
11   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
12 < Requires: gccxml python qt gsl castor openssl mysql libpng libjpg dcap pcre zlib oracle
12 > Requires: gccxml python qt gsl castor openssl mysql libpng libjpg dcap pcre zlib oracle libungif
13  
14   %if "%cpu" != "amd64"
15   Requires: libtiff
# Line 13 | Line 17 | Requires: libtiff
17  
18   %prep
19   %setup -n root
20 + %patch -p0
21 +
22   %build
23 + ## IMPORT gcc-wrapper
24   mkdir -p %i
25   export ROOTSYS=%_builddir/root
26   CONFIG_ARGS="--enable-table
# Line 23 | Line 30 | CONFIG_ARGS="--enable-table
30               --with-gccxml=${GCCXML_ROOT}
31               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
32               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
26             --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include
33               --enable-explicitlink
34               --enable-qtgsi
35               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
# Line 39 | Line 45 | CONFIG_ARGS="--enable-table
45               --with-dcap-incdir=${DCAP_ROOT}/include
46               --with-ssl-incdir=${OPENSSL_ROOT}/include
47               --with-ssl-libdir=${OPENSSL_ROOT}/lib
42             --with-shift-incdir=${CASTOR_ROOT}/include/shift
43             --with-shift-libdir=${CASTOR_ROOT}/lib
48               --with-gsl-incdir=${GSL_ROOT}/include
49               --with-gsl-libdir=${GSL_ROOT}/lib
50               --disable-pgsql
51               --disable-xml"
52  
53 < case $(uname)-$(uname -m) in
53 > case $(uname)-$(uname -p) in
54    Linux-x86_64)
55 <    ./configure linuxx8664gcc $CONFIG_ARGS --disable-astiff;;
56 <  Linux*)
57 <    ./configure linux $CONFIG_ARGS;;
55 >    ./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;;
56 >  Linux-i*86)
57 >    ./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;;
58    Darwin*)
59 <    ./configure macosx $CONFIG_ARGS;;
59 >    ./configure macosx $CONFIG_ARGS --disable-rfio;;
60 >  Linux-ppc64*)
61 >    ./configure linux $CONFIG_ARGS --disable-rfio;;
62   esac
63  
64   make

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines