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.241 by elmer, Wed Feb 9 14:10:29 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 "%online-%ismac" == "false-false"
48 < Requires: openssl zlib qt xrootd
47 > %if "%ismac" == "true"
48 > Requires: gfortran-macosx
49 > %endif
50 >
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-oracle
141               --disable-xml ${EXTRA_CONFIG_ARGS}"
142  
143 < case $(uname)-$(uname -m) in
144 <  Linux-x86_64)
143 > case %cmsos in
144 >  slc*_amd64)
145      ./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 ;;
146 <  Linux-i*86)
146 >  slc*_ia32)
147      ./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 ;;
148 <  Darwin*)
148 >  osx*)
149      case %cmsplatf in
150      *_ia32_* )
151        comparch=i386
# Line 131 | Line 160 | case $(uname)-$(uname -m) in
160        macconfig=macosx
161        ;;
162      esac
163 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
164 <    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
165 <  Linux-ppc64*)
163 >    export CC=`which gcc` CXX=`which g++`
164 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
165 >  slc*_ppc64*)
166      ./configure linux $CONFIG_ARGS --disable-rfio;;
167   esac
168  
# Line 145 | Line 174 | case %cmsplatf in
174     makeopts="%makeprocesses"
175    ;;
176   esac
177 <
178 < make $makeopts
177 >
178 > make $makeopts
179   make cintdlls
180  
181   %install
# Line 165 | Line 194 | export ROOTSYS=%i
194   make INSTALL="$cp" INSTALLDATA="$cp" install
195   mkdir -p $ROOTSYS/lib/python
196   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
197 + # This file confuses rpm's find-requires because it starts with
198 + # a """ and it thinks is the shebang.
199 + rm -f %i/tutorials/pyroot/mrt.py
200  
201   # SCRAM ToolBox toolfile
202   mkdir -p %i/etc/scram.d

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines