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.185 by elmer, Wed Dec 9 12:59:11 2009 UTC vs.
Revision 1.193 by elmer, Mon Mar 29 11:21:08 2010 UTC

# Line 14 | Line 14 | Patch4:  root-5.22-00d-fireworks-graf3d-
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
17 > # patch 8 was dropped
18   Patch9: root-5.22-00a-fireworks1
19   Patch10: root-5.22-00a-gcc44
20   Patch11: root-5.22-00a-fireworks2
# Line 25 | Line 25 | Patch15: root-5.22-00d-fireworks5
25   Patch16: root-5.22-00d-genreflex_python26_popen3
26   Patch17: root-5.22-00d-fireworks6
27   Patch18: root-5.22-00d-linker-gnu-hash-style
28 < Patch19: root-5.22-00d-TFile-version3-Init
28 > Patch19: root-5.22-00d-TFile-version3-Init
29 > Patch20: root-5.22-00d-cint-namespace
30 > Patch21: root-5.22-00d-fireworks7
31  
32   %define cpu %(echo %cmsplatf | cut -d_ -f2)
33  
# Line 56 | Line 58 | Requires: libtiff
58   %patch5 -p1
59   %patch6 -p1
60   %patch7 -p1
61 < %patch8 -p1
61 > # patch 8 was dropped
62   %patch9 -p1
63  
64   # patch10 is compiler version dependent, see below
# Line 76 | Line 78 | rm graf3d/gl/src/gl2ps.c.orig
78   %patch16 -p1
79   %patch17 -p1
80   %patch19 -p1
81 + %patch20 -p1
82 + %patch21 -p1
83  
84   case %gccver in
85    4.3.*)
# Line 143 | Line 147 | case $(uname)-$(uname -m) in
147    Linux-i*86)
148      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
149    Darwin*)
150 <    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
150 >    case %cmsplatf in
151 >    *_ia32_* )
152 >      comparch=i386 ;;
153 >    *_amd64_* )
154 >      comparch=x86_64 ;;
155 >    * )
156 >      comparch=ppc ;;
157 >    esac
158 >    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
159 >    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
160    Linux-ppc64*)
161      ./configure linux $CONFIG_ARGS --disable-rfio;;
162   esac
# Line 264 | Line 277 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
277    </tool>
278   EOF_TOOLFILE
279  
280 < # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
281 < # have been removed for the moment)
280 > # rootinteractive toolfile (GQt/qt lib dependencies
281 > # have been moved to rootqt.xml)
282   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
283    <tool name="rootinteractive" version="%v">
284      <info url="http://root.cern.ch/root/"/>
285      <lib name="Rint"/>
273 –    <lib name="GQt"/>
286      <lib name="Gui"/>
275 –    <use name="qt"/>
287      <use name="libjpg"/>
288      <use name="libpng"/>
289      <use name="rootgpad"/>
290    </tool>
291   EOF_TOOLFILE
292  
293 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
294 +  <tool name="rootqt" version="%v">
295 +    <info url="http://root.cern.ch/root/"/>
296 +    <lib name="GQt"/>
297 +    <use name="qt"/>
298 +  </tool>
299 + EOF_TOOLFILE
300 +
301   # rootmath toolfile
302   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
303    <tool name="rootmath" version="%v">

Diff Legend

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