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.230 by elmer, Thu Jan 20 20:28:08 2011 UTC vs.
Revision 1.236 by eulisse, Mon Jan 24 16:50:58 2011 UTC

# Line 27 | Line 27 | Patch13: root-5.27-06b-tmva_Event_dynami
27  
28   Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
29  
30 < %if "%ismac" == "false"
30 > %if "%ismac" != "true"
31   Requires: castor dcap
32   %endif
33  
34 < %if "%online-%ismac" == "false-true"
35 < Requires: openssl zlib gfortran-macosx
34 > %if "%online" != "true"
35 > Requires: openssl zlib xrootd
36   %endif
37  
38 < %if "%online-%ismac" == "false-false"
39 < Requires: openssl zlib qt xrootd
38 > %if "%ismac" == "true"
39 > Requires: gfortran-macosx
40 > %endif
41 >
42 > %if "%online" != "true"
43 > %if "%ismac" != "true"
44 > Requires: qt
45 > %endif
46   %endif
47  
48   %prep
# Line 64 | Line 70 | case %cmsplatf in
70    ;;
71   esac
72  
73 + # Delete these (irrelevant) files as the fits appear to confuse rpm on OSX
74 + # (It tries to run install_name_tool on them.)
75 + rm -fR tutorials/fitsio
76 +
77   %build
78  
79   mkdir -p %i
# Line 109 | Line 119 | CONFIG_ARGS="--enable-table
119               --with-dcap-incdir=${DCAP_ROOT}/include
120               --disable-pgsql
121               --disable-mysql
122 +             --disable-oracle
123               --disable-xml ${EXTRA_CONFIG_ARGS}"
124  
125 < case $(uname)-$(uname -m) in
126 <  Linux-x86_64)
125 > case %cmsos in
126 >  slc*_amd64)
127      ./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 ;;
128 <  Linux-i*86)
128 >  slc*_ia32)
129      ./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 ;;
130 <  Darwin*)
130 >  osx*)
131      case %cmsplatf in
132      *_ia32_* )
133 <      comparch=i386 ;;
133 >      comparch=i386
134 >      macconfig=macosx
135 >      ;;
136      *_amd64_* )
137 <      comparch=x86_64 ;;
137 >      comparch=x86_64
138 >      macconfig=macosx64
139 >      ;;
140      * )
141 <      comparch=ppc ;;
141 >      comparch=ppc
142 >      macconfig=macosx
143 >      ;;
144      esac
145 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
146 <    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
147 <  Linux-ppc64*)
145 >    export CC=`which gcc` CXX=`which g++`
146 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
147 >  slc*_ppc64*)
148      ./configure linux $CONFIG_ARGS --disable-rfio;;
149   esac
150  
# Line 139 | Line 156 | case %cmsplatf in
156     makeopts="%makeprocesses"
157    ;;
158   esac
159 <
160 < make $makeopts
159 >
160 > make $makeopts
161   make cintdlls
162  
163   %install
# Line 159 | Line 176 | export ROOTSYS=%i
176   make INSTALL="$cp" INSTALLDATA="$cp" install
177   mkdir -p $ROOTSYS/lib/python
178   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
179 + # This file confuses rpm's find-requires because it starts with
180 + # a """ and it thinks is the shebang.
181 + rm -f %i/tutorials/pyroot/mrt.py
182  
183   # SCRAM ToolBox toolfile
184   mkdir -p %i/etc/scram.d

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines