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.243 by elmer, Wed Feb 9 23:09:04 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 >
35   %define cpu %(echo %cmsplatf | cut -d_ -f2)
36  
37   Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
38  
39 < %if "%ismac" == "false"
39 > %if "%ismac" != "true"
40   Requires: castor dcap
41   %endif
42  
43 < %if "%online-%ismac" == "false-true"
44 < Requires: openssl zlib gfortran-macosx
43 > %if "%online" != "true"
44 > Requires: openssl zlib xrootd
45 > %endif
46 >
47 > %if "%ismac" == "true"
48 > Requires: gfortran-macosx
49   %endif
50  
51 < %if "%online-%ismac" == "false-false"
52 < Requires: openssl zlib qt xrootd
51 > %if "%online" != "true"
52 > %if "%ismac" != "true"
53 > Requires: qt
54 > %endif
55   %endif
56  
57   %prep
# Line 55 | Line 70 | Requires: openssl zlib qt xrootd
70   %patch11 -p1
71   %patch12 -p1
72   %patch13 -p1
73 + %patch14 -p1
74 + %patch15 -p1
75 + %patch16 -p1
76 + %patch17 -p0
77 + %patch18 -p1
78 + %patch19 -p0
79 + %patch20 -p1
80 + %patch21 -p1
81 + %patch22 -p1
82  
83   # The following patch can only be applied on SLC5 or later (extra linker
84   # options only available with the SLC5 binutils)
# Line 64 | Line 88 | case %cmsplatf in
88    ;;
89   esac
90  
91 + # Delete these (irrelevant) files as the fits appear to confuse rpm on OSX
92 + # (It tries to run install_name_tool on them.)
93 + rm -fR tutorials/fitsio
94 +
95   %build
96  
97   mkdir -p %i
# Line 109 | Line 137 | CONFIG_ARGS="--enable-table
137               --with-dcap-incdir=${DCAP_ROOT}/include
138               --disable-pgsql
139               --disable-mysql
140 <             --disable-xml ${EXTRA_CONFIG_ARGS}"
140 >             --disable-oracle ${EXTRA_CONFIG_ARGS}"
141  
142 < case $(uname)-$(uname -m) in
143 <  Linux-x86_64)
142 > case %cmsos in
143 >  slc*_amd64)
144      ./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 ;;
145 <  Linux-i*86)
145 >  slc*_ia32)
146      ./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 ;;
147 <  Darwin*)
147 >  osx*)
148      case %cmsplatf in
149      *_ia32_* )
150        comparch=i386
# Line 131 | Line 159 | case $(uname)-$(uname -m) in
159        macconfig=macosx
160        ;;
161      esac
162 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
163 <    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
164 <  Linux-ppc64*)
162 >    export CC=`which gcc` CXX=`which g++`
163 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
164 >  slc*_ppc64*)
165      ./configure linux $CONFIG_ARGS --disable-rfio;;
166   esac
167  
168 < case %cmsplatf in
169 <  osx*)
170 <   makeopts=
143 <  ;;
144 <  *)
145 <   makeopts="%makeprocesses"
146 <  ;;
147 < esac
148 <
149 < make $makeopts
168 > makeopts="%makeprocesses"
169 >
170 > make $makeopts
171   make cintdlls
172  
173   %install
# Line 165 | Line 186 | export ROOTSYS=%i
186   make INSTALL="$cp" INSTALLDATA="$cp" install
187   mkdir -p $ROOTSYS/lib/python
188   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
189 + # This file confuses rpm's find-requires because it starts with
190 + # a """ and it thinks is the shebang.
191 + rm -f %i/tutorials/pyroot/mrt.py
192  
193   # SCRAM ToolBox toolfile
194   mkdir -p %i/etc/scram.d
# Line 356 | Line 380 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
380    </tool>
381   EOF_TOOLFILE
382  
383 + # rootxml toolfile
384 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootxml.xml
385 +  <tool name="rootxml" version="%v">
386 +    <info url="http://root.cern.ch/root/"/>
387 +    <lib name="XMLParser"/>
388 +    <use name="ROOTCore"/>
389 +  </tool>
390 + EOF_TOOLFILE
391 +
392 + # rootfoam toolfile
393 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootfoam.xml
394 +  <tool name="rootfoam" version="%v">
395 +    <info url="http://root.cern.ch/root/"/>
396 +    <lib name="Foam"/>
397 +    <use name="roothistmatrix"/>
398 +  </tool>
399 + EOF_TOOLFILE
400 +
401   %post
402   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
403  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines