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.199 by elmer, Wed Jun 23 14:17:30 2010 UTC

# Line 1 | Line 1
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 )
7   %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8  
9 < 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-00d-fireworks-graf3d-gui
14 < Patch5:  root-5.22-00a-roofit-silence-static-printout
9 > Patch0: root-5.18-00-libpng
10 > Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
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-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
17 > Patch8: root-5.22-00d-makelib-ldl
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 > Patch22: root-5.22-00d-TMath-Vavilov
32 > Patch23: root-5.22-00d-TBranchElement-dropped-data-member
33 > Patch24: root-5.22-00d-fireworks8
34  
35   %define cpu %(echo %cmsplatf | cut -d_ -f2)
36  
# Line 76 | Line 81 | rm graf3d/gl/src/gl2ps.c.orig
81   %patch16 -p1
82   %patch17 -p1
83   %patch19 -p1
84 + %patch20 -p1
85 + %patch21 -p1
86 + %patch22 -p1
87 + %patch23 -p1
88 + %patch24 -p1
89  
90   case %gccver in
91    4.3.*)
# Line 143 | Line 153 | case $(uname)-$(uname -m) in
153    Linux-i*86)
154      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
155    Darwin*)
156 <    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
156 >    case %cmsplatf in
157 >    *_ia32_* )
158 >      comparch=i386 ;;
159 >    *_amd64_* )
160 >      comparch=x86_64 ;;
161 >    * )
162 >      comparch=ppc ;;
163 >    esac
164 >    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
165 >    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
166    Linux-ppc64*)
167      ./configure linux $CONFIG_ARGS --disable-rfio;;
168   esac
# Line 264 | Line 283 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
283    </tool>
284   EOF_TOOLFILE
285  
286 < # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
287 < # have been removed for the moment)
286 > # rootinteractive toolfile (GQt/qt lib dependencies
287 > # have been moved to rootqt.xml)
288   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
289    <tool name="rootinteractive" version="%v">
290      <info url="http://root.cern.ch/root/"/>
291      <lib name="Rint"/>
273    <lib name="GQt"/>
292      <lib name="Gui"/>
275    <use name="qt"/>
293      <use name="libjpg"/>
294      <use name="libpng"/>
295      <use name="rootgpad"/>
296    </tool>
297   EOF_TOOLFILE
298  
299 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
300 +  <tool name="rootqt" version="%v">
301 +    <info url="http://root.cern.ch/root/"/>
302 +    <lib name="GQt"/>
303 +    <use name="qt"/>
304 +  </tool>
305 + EOF_TOOLFILE
306 +
307   # rootmath toolfile
308   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
309    <tool name="rootmath" version="%v">

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines