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.132 by elmer, Thu Jan 15 00:59:45 2009 UTC vs.
Revision 1.143 by gowdy, Fri Feb 6 11:52:54 2009 UTC

# Line 2 | Line 2
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
5 < Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
5 > #Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6 > Source: http://cern.ch/elmer/root_v5.22.00a.source.tar.gz
7  
8   Patch0:  root-5.18-00-libpng
9   Patch1:  root-5.21-04-CINT-maxlongline
10 < Patch2:  root-5.22-00-TClass-Clone
11 < Patch3:  root-5.22-00-gendict
12 < Patch4:  root-5.22-00-RootSys
10 > Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
11 > #Patch3:  root-5.22-00-gendict
12 > #Patch4:  root-5.22-00-RootSys
13 > #Patch5:  root-5.22-00-TClass-Clone
14 > #Patch6:  root-5.22-00-TBranchElement_initializeoffsets
15 > #Patch7:  root-5.22-00-TBranchElement-pcanal
16 > #Patch8:  root-5.22-00-TTreeCloner-CollectBranches-fix
17 > #Patch9:  root-5.22-00-path-length-fix1
18 > #Patch10:  root-5.22-00-path-length-fix2
19  
20   %define cpu %(echo %cmsplatf | cut -d_ -f2)
21   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 34 | Line 41 | Requires: libtiff
41   %patch0 -p1
42   %patch1 -p1
43   %patch2 -p1
44 < %patch3 -p1
45 < %patch4 -p1
44 > #%patch3 -p1
45 > #%patch4 -p1
46 > #%patch5 -p1
47 > #%patch6 -p0
48 > #%patch7 -p1
49 > #%patch8 -p1
50 > #%patch9 -p1
51 > #%patch10 -p1
52  
53   %build
54   mkdir -p %i
# Line 89 | Line 102 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
102  
103   case $(uname)-$(uname -p) in
104    Linux-x86_64)
105 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
105 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
106    Linux-i*86)
107      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
108    Darwin*)

Diff Legend

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