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.231 by elmer, Thu Jan 20 22:54:31 2011 UTC vs.
Revision 1.244 by elmer, Wed Feb 9 23:54:50 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 > 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
40  
41 < %if "%ismac" == "false"
41 > %if "%ismac" != "true"
42   Requires: castor dcap
43   %endif
44  
45 < %if "%online-%ismac" == "false-true"
46 < Requires: openssl zlib gfortran-macosx
45 > %if "%online" != "true"
46 > Requires: openssl zlib xrootd
47 > %endif
48 >
49 > %if "%ismac" == "true"
50 > Requires: gfortran-macosx
51   %endif
52  
53 < %if "%online-%ismac" == "false-false"
54 < Requires: openssl zlib qt xrootd
53 > %if "%online" != "true"
54 > %if "%ismac" != "true"
55 > Requires: qt
56 > %endif
57   %endif
58  
59   %prep
# Line 55 | Line 72 | Requires: openssl zlib qt xrootd
72   %patch11 -p1
73   %patch12 -p1
74   %patch13 -p1
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 64 | Line 92 | case %cmsplatf in
92    ;;
93   esac
94  
95 + # Delete these (irrelevant) files as the fits appear to confuse rpm on OSX
96 + # (It tries to run install_name_tool on them.)
97 + rm -fR tutorials/fitsio
98 +
99   %build
100  
101   mkdir -p %i
# Line 109 | Line 141 | CONFIG_ARGS="--enable-table
141               --with-dcap-incdir=${DCAP_ROOT}/include
142               --disable-pgsql
143               --disable-mysql
144 <             --disable-xml ${EXTRA_CONFIG_ARGS}"
144 >             --disable-oracle ${EXTRA_CONFIG_ARGS}"
145  
146 < case $(uname)-$(uname -m) in
147 <  Linux-x86_64)
146 > case %cmsos in
147 >  slc*_amd64)
148      ./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 ;;
149 <  Linux-i*86)
149 >  slc*_ia32)
150      ./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 ;;
151 <  Darwin*)
151 >  osx*)
152      case %cmsplatf in
153      *_ia32_* )
154        comparch=i386
# Line 131 | Line 163 | case $(uname)-$(uname -m) in
163        macconfig=macosx
164        ;;
165      esac
166 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
167 <    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
168 <  Linux-ppc64*)
166 >    export CC=`which gcc` CXX=`which g++`
167 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
168 >  slc*_ppc64*)
169      ./configure linux $CONFIG_ARGS --disable-rfio;;
170   esac
171  
172 < case %cmsplatf in
173 <  osx*)
174 <   makeopts=
143 <  ;;
144 <  *)
145 <   makeopts="%makeprocesses"
146 <  ;;
147 < esac
148 <
149 < make $makeopts
172 > makeopts="%makeprocesses"
173 >
174 > make $makeopts
175   make cintdlls
176  
177   %install
# Line 165 | 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
# Line 356 | 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