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.235 by fwyzard, Fri Jan 21 12:31:46 2011 UTC vs.
Revision 1.240 by elmer, Mon Feb 7 21:40:44 2011 UTC

# Line 21 | Line 21 | Patch9: root-5.27-06b-r36572
21   Patch10: root-5.27-06b-r36707
22   Patch11: root-5.27-06b-r36594
23   Patch12: root-5.27-06b-tmva-MethodBase-initvar
24 < Patch13: root-5.27-06b-tmva_Event_dynamic_hack
25 <
24 > 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 > 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 >
33   %define cpu %(echo %cmsplatf | cut -d_ -f2)
34  
35   Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
# Line 61 | Line 68 | Requires: qt
68   %patch11 -p1
69   %patch12 -p1
70   %patch13 -p1
71 + %patch14 -p1
72 + %patch15 -p1
73 + %patch16 -p1
74 + %patch17 -p0
75 + %patch18 -p1
76 + %patch19 -p0
77 + %patch20 -p1
78  
79   # The following patch can only be applied on SLC5 or later (extra linker
80   # options only available with the SLC5 binutils)
# Line 122 | Line 136 | CONFIG_ARGS="--enable-table
136               --disable-oracle
137               --disable-xml ${EXTRA_CONFIG_ARGS}"
138  
139 < case $(uname)-$(uname -m) in
140 <  Linux-x86_64)
139 > case %cmsos in
140 >  slc*_amd64)
141      ./configure linuxx8664gcc $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
142 <  Linux-i*86)
142 >  slc*_ia32)
143      ./configure linux  $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
144 <  Darwin*)
144 >  osx*)
145      case %cmsplatf in
146      *_ia32_* )
147        comparch=i386
# Line 142 | Line 156 | case $(uname)-$(uname -m) in
156        macconfig=macosx
157        ;;
158      esac
159 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
160 <    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
161 <  Linux-ppc64*)
159 >    export CC=`which gcc` CXX=`which g++`
160 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
161 >  slc*_ppc64*)
162      ./configure linux $CONFIG_ARGS --disable-rfio;;
163   esac
164  
# Line 156 | Line 170 | case %cmsplatf in
170     makeopts="%makeprocesses"
171    ;;
172   esac
173 <
174 < make $makeopts
173 >
174 > make $makeopts
175   make cintdlls
176  
177   %install
# Line 176 | Line 190 | export ROOTSYS=%i
190   make INSTALL="$cp" INSTALLDATA="$cp" install
191   mkdir -p $ROOTSYS/lib/python
192   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
193 + # This file confuses rpm's find-requires because it starts with
194 + # a """ and it thinks is the shebang.
195 + rm -f %i/tutorials/pyroot/mrt.py
196  
197   # SCRAM ToolBox toolfile
198   mkdir -p %i/etc/scram.d

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines