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.80 by elmer, Tue Nov 20 21:41:17 2007 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS11
1 > ### RPM lcg root 5.14.00g-CMS18
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 12 | Line 12 | Patch4: root_TXMLSetup
12   Patch5: root-Cintex
13   Patch6: root_Reflex_Cintex
14   Patch7: root_CallFunc
15 < Patch8: root-proofd
15 > # The following patch should only be applied for gcc4.x (x>0) and when
16 > # using gccxml 0.7.0
17 > Patch9: root_5.14_reflex_gccxml070_update
18 > Patch10: root-5.14-xrootd-20071001-0000a
19  
20   %define cpu %(echo %cmsplatf | cut -d_ -f2)
21   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 32 | Line 35 | Requires: libtiff
35   %patch5 -p1
36   %patch6 -p0
37   %patch7 -p0
38 < %patch8 -p1
38 > %if "%cmsplatf" == "slc4_ia32_gcc412"
39 > %patch9 -p1
40 > %endif
41 > %patch10 -p1
42  
43   %build
44   mkdir -p %i
# Line 65 | Line 71 | CONFIG_ARGS="--enable-table
71               --disable-pgsql
72               --disable-xml"
73  
74 + %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_amd64_gcc345"))
75 +  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
76 + %endif
77 +
78   case $(uname)-$(uname -p) in
79    Linux-x86_64)
80      ./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;;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines