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.237 by elmer, Mon Jan 24 22:49:09 2011 UTC vs.
Revision 1.244 by elmer, Wed Feb 9 23:54:50 2011 UTC

# Line 25 | Line 25 | Patch13: root-5.27-06b-r37582-tmva
25   Patch14: root-5.27-06b-r37405
26   Patch15: root-5.27-06b-r37556
27   Patch16: root-5.27-06-fireworks10
28 <
28 > Patch17: root-5.27-06-TTreeClonerTopLevel
29 > Patch18: root-5.27-06b-r37947
30 > Patch19: root-5.27-06b-TTreeCache-r37950-r37919-r37917-r37916-r37906
31 > Patch20: root-5.27-06b-extra-math-for-roofit-5.28.00
32 > Patch21: root-5.27-06b-TEfficiency-backport-from-5.28.00
33 > Patch22: root-5.27-06b-histfactory-bits-from-5.28.00
34 > Patch23: root-5.27-06b-r37210
35 > Patch24: root-5.27-06b-r38023
36 >
37   %define cpu %(echo %cmsplatf | cut -d_ -f2)
38  
39   Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
# Line 67 | Line 75 | Requires: qt
75   %patch14 -p1
76   %patch15 -p1
77   %patch16 -p1
78 + %patch17 -p0
79 + %patch18 -p1
80 + %patch19 -p0
81 + %patch20 -p1
82 + %patch21 -p1
83 + %patch22 -p1
84 + %patch23 -p1
85 + %patch24 -p1
86  
87   # The following patch can only be applied on SLC5 or later (extra linker
88   # options only available with the SLC5 binutils)
# Line 125 | Line 141 | CONFIG_ARGS="--enable-table
141               --with-dcap-incdir=${DCAP_ROOT}/include
142               --disable-pgsql
143               --disable-mysql
144 <             --disable-oracle
129 <             --disable-xml ${EXTRA_CONFIG_ARGS}"
144 >             --disable-oracle ${EXTRA_CONFIG_ARGS}"
145  
146   case %cmsos in
147    slc*_amd64)
# Line 154 | Line 169 | case %cmsos in
169      ./configure linux $CONFIG_ARGS --disable-rfio;;
170   esac
171  
172 < case %cmsplatf in
158 <  osx*)
159 <   makeopts=
160 <  ;;
161 <  *)
162 <   makeopts="%makeprocesses"
163 <  ;;
164 < esac
172 > makeopts="%makeprocesses"
173  
174   make $makeopts
175   make cintdlls
# Line 376 | Line 384 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
384    </tool>
385   EOF_TOOLFILE
386  
387 + # rootxml toolfile
388 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootxml.xml
389 +  <tool name="rootxml" version="%v">
390 +    <info url="http://root.cern.ch/root/"/>
391 +    <lib name="XMLParser"/>
392 +    <use name="ROOTCore"/>
393 +  </tool>
394 + EOF_TOOLFILE
395 +
396 + # rootfoam toolfile
397 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootfoam.xml
398 +  <tool name="rootfoam" version="%v">
399 +    <info url="http://root.cern.ch/root/"/>
400 +    <lib name="Foam"/>
401 +    <use name="roothistmatrix"/>
402 +  </tool>
403 + EOF_TOOLFILE
404 +
405   %post
406   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
407  

Diff Legend

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