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.26 by elmer, Wed Jul 26 05:24:48 2006 UTC vs.
Revision 1.43 by sashby, Mon Nov 13 13:20:35 2006 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.12.00
1 > ### RPM lcg root 5.13.04c
2   # INITENV +PATH PYTHONPATH %i/lib/python
3 < Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %v | tr . -)&module=root&output=/%{n}_v%{v}.source.tar.gz
4 < #Source: ftp://root.cern.ch/%n/%{n}_v%{v}.source.tar.gz
3 > %define realVersion %(echo %v | cut -d- -f1)
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
5 > #Source: ftp://root.cern.ch/%n/%{n}_v%{realVersion}.source.tar.gz
6   %define cpu %(echo %cmsplatf | cut -d_ -f2)
7 + %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
8   Requires: gccxml python qt gsl castor openssl mysql libpng libjpg dcap pcre zlib oracle
9  
10   %if "%cpu" != "amd64"
# Line 20 | Line 22 | CONFIG_ARGS="--enable-table
22               --disable-builtin-freetype
23               --disable-builtin-zlib
24               --with-gccxml=${GCCXML_ROOT}
25 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include
25 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
26               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
27               --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include
28               --enable-explicitlink
# Line 34 | Line 36 | CONFIG_ARGS="--enable-table
36               --enable-roofit
37               --disable-ldap
38               --disable-krb5
39 <             --with-dcap-libdir=${DCAP_ROOT}/lib
39 >                 --with-dcap-libdir=${DCAP_ROOT}/lib
40               --with-dcap-incdir=${DCAP_ROOT}/include
41               --with-ssl-incdir=${OPENSSL_ROOT}/include
42               --with-ssl-libdir=${OPENSSL_ROOT}/lib
43               --with-shift-incdir=${CASTOR_ROOT}/include/shift
44               --with-shift-libdir=${CASTOR_ROOT}/lib
45 +             --with-gsl-incdir=${GSL_ROOT}/include
46 +             --with-gsl-libdir=${GSL_ROOT}/lib
47               --disable-pgsql
48               --disable-xml"
49  
# Line 70 | Line 74 | export ROOTSYS=%i/root
74   make INSTALL="$cp" INSTALLDATA="$cp" install
75   mkdir -p %i/root/lib/python
76   cp -r reflex/python/genreflex %i/root/lib/python
77 + #

Diff Legend

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