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.168 by elmer, Mon Jul 6 12:14:23 2009 UTC vs.
Revision 1.178 by elmer, Mon Sep 21 14:58:38 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00a
1 > ### RPM lcg root 5.22.00d
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3 < ## INITENV SET ROOTSYS %i
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
6   %define closingbrace )
# Line 10 | Line 10 | Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
11   Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
12   Patch3:  root-5.22-00a-TMVA-shut-the-hell-up-again
13 < Patch4:  root-5.22-00a-CINTFunctional
14 < Patch5:  root-5.22-00a-TClass
15 < Patch6:  root-5.22-00a-fireworks-graf3d-gui
16 < Patch7:  root-5.22-00a-Reflex-Class
17 < Patch8:  root-5.22-00a-Cintex
18 < Patch9:  root-5.22-00a-roofit-silence-static-printout
19 < Patch10: root-5.22-00a-TMVA-just-shut-the-hell-up
20 < Patch11: root-5.22-00a-th1
21 < Patch12: root-5.22-00a-smatrix
22 < Patch13: root-5.22-00a-fireworks1
23 < Patch14: root-5.22-00a-Reflex-gendict_selclass
24 < Patch15: root-5.22-00a-MatrixInversion
25 < Patch16: root-5.22-00a-gcc44
26 < Patch17: root-5.22-00a-fireworks2
27 < Patch18: root-5.22-00a-fireworks3
28 < Patch19: root-5.22-00a-TBranchElement
29 < Patch20: root-5.22-00a-tmplt
30 < Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
31 < Patch22: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
13 > Patch4:  root-5.22-00d-fireworks-graf3d-gui
14 > Patch5:  root-5.22-00a-roofit-silence-static-printout
15 > Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
16 > Patch7: root-5.22-00a-th1
17 > Patch8: root-5.22-00a-smatrix
18 > Patch9: root-5.22-00a-fireworks1
19 > Patch10: root-5.22-00a-gcc44
20 > Patch11: root-5.22-00a-fireworks2
21 > Patch12: root-5.22-00a-fireworks3
22 > Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
23 > Patch14: root-5.22-00a-fireworks4
24 > Patch15: root-5.22-00d-fireworks5
25  
26   %define cpu %(echo %cmsplatf | cut -d_ -f2)
27   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 56 | Line 49 | Requires: libtiff
49   %patch2 -p1
50   %patch3 -p1
51   %patch4 -p1
52 +
53   %patch5 -p1
54   %patch6 -p1
55 < %patch7 -p0
56 < %patch8 -p0
55 > %patch7 -p1
56 > %patch8 -p1
57   %patch9 -p1
58 < %patch10 -p1
58 >
59 > # patch10 is compiler version dependent, see below
60   %patch11 -p1
61   %patch12 -p1
62 < %patch13 -p1
63 < %patch14 -p0
69 < %patch15 -p0
70 < # patch16 is compiler version dependent, see below
71 < %patch17 -p1
72 < %patch18 -p1
73 < %patch19 -p0
74 < %patch20 -p0
75 < %patch21 -p0
62 > # patch13 is compiler version dependent, see below
63 >
64   # work around patch issue...
65   rm graf3d/gl/src/gl2ps.c
66 < # patch22 is compiler version dependent, see below
66 > %patch14 -p1
67 > #work around patch issues in patch14(?)
68 > rm graf3d/eve/inc/TEveLegoOverlay.h.orig
69 > rm graf3d/eve/src/TEveLegoOverlay.cxx
70 > rm graf3d/gl/inc/gl2ps.h.orig
71 > rm graf3d/gl/src/gl2ps.c.orig
72 > %patch15 -p1
73  
74   case %gccver in
75 <  4.3)
76 < %patch22 -p1
75 >  4.3.*)
76 > %patch13 -p1
77    ;;
78 <  4.4)
79 < %patch16 -p1
78 >  4.4.*)
79 > %patch10 -p1
80    ;;
81   esac
82  
# Line 121 | Line 115 | CONFIG_ARGS="--enable-table
115               --enable-reflex  
116               --enable-cintex
117               --enable-minuit2
124             --enable-roofit
118               --disable-ldap
119               --disable-krb5
120               --with-gsl-incdir=${GSL_ROOT}/include
# Line 348 | Line 341 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
341   </Tool>
342   EOF_TOOLFILE
343  
351 # rootroofit toolfile
352 cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
353 <doc type=BuildSystem::ToolDoc version=1.0>
354 <Tool name=rootroofit version=%v>
355 <info url="http://root.cern.ch/root/"></info>
356 <lib name=RooFit>
357 <lib name=RooFitCore>
358 <use name=ROOTMinuit>
359 </Tool>
360 EOF_TOOLFILE
361
344   # rootmlp toolfile
345   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp
346   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 402 | Line 384 | EOF_TOOLFILE
384   %{relocateConfig}etc/scram.d/rootminuit2
385   %{relocateConfig}etc/scram.d/rootrflx
386   %{relocateConfig}etc/scram.d/roothtml
405 %{relocateConfig}etc/scram.d/rootroofit
387   %{relocateConfig}etc/scram.d/rootmlp
388   %{relocateConfig}etc/scram.d/roottmva
389   %{relocateConfig}etc/scram.d/rootthread

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines