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.221 by elmer, Mon Nov 29 13:46:57 2010 UTC vs.
Revision 1.237 by elmer, Mon Jan 24 22:49:09 2011 UTC

# Line 5 | Line 5
5   Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6   %define closingbrace )
7   %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8 + %define ismac %(case %cmsplatf in osx*%closingbrace echo true;; *%closingbrace e
9 + cho false;; esac)
10  
11   Patch0: root-5.27-06-externals
12   Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
# Line 18 | Line 20 | Patch8: root-5.27-06b-r36567
20   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-r37582-tmva
25 + Patch14: root-5.27-06b-r37405
26 + Patch15: root-5.27-06b-r37556
27 + Patch16: root-5.27-06-fireworks10
28  
29   %define cpu %(echo %cmsplatf | cut -d_ -f2)
30  
31 < Requires: xrootd gccxml gsl castor libjpg dcap pcre python fftw3
31 > Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
32 >
33 > %if "%ismac" != "true"
34 > Requires: castor dcap
35 > %endif
36 >
37 > %if "%online" != "true"
38 > Requires: openssl zlib xrootd
39 > %endif
40 >
41 > %if "%ismac" == "true"
42 > Requires: gfortran-macosx
43 > %endif
44 >
45   %if "%online" != "true"
46 < Requires: qt openssl libpng zlib libungif libtiff
46 > %if "%ismac" != "true"
47 > Requires: qt
48 > %endif
49   %endif
50  
51   %prep
# Line 40 | Line 62 | Requires: qt openssl libpng zlib libungi
62   %patch9 -p1
63   %patch10 -p1
64   %patch11 -p1
65 + %patch12 -p1
66 + %patch13 -p1
67 + %patch14 -p1
68 + %patch15 -p1
69 + %patch16 -p1
70  
71   # The following patch can only be applied on SLC5 or later (extra linker
72   # options only available with the SLC5 binutils)
# Line 49 | Line 76 | case %cmsplatf in
76    ;;
77   esac
78  
79 + # Delete these (irrelevant) files as the fits appear to confuse rpm on OSX
80 + # (It tries to run install_name_tool on them.)
81 + rm -fR tutorials/fitsio
82 +
83   %build
84  
85   mkdir -p %i
# Line 94 | Line 125 | CONFIG_ARGS="--enable-table
125               --with-dcap-incdir=${DCAP_ROOT}/include
126               --disable-pgsql
127               --disable-mysql
128 +             --disable-oracle
129               --disable-xml ${EXTRA_CONFIG_ARGS}"
130  
131 < case $(uname)-$(uname -m) in
132 <  Linux-x86_64)
131 > case %cmsos in
132 >  slc*_amd64)
133      ./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 ;;
134 <  Linux-i*86)
134 >  slc*_ia32)
135      ./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 ;;
136 <  Darwin*)
136 >  osx*)
137      case %cmsplatf in
138      *_ia32_* )
139 <      comparch=i386 ;;
139 >      comparch=i386
140 >      macconfig=macosx
141 >      ;;
142      *_amd64_* )
143 <      comparch=x86_64 ;;
143 >      comparch=x86_64
144 >      macconfig=macosx64
145 >      ;;
146      * )
147 <      comparch=ppc ;;
147 >      comparch=ppc
148 >      macconfig=macosx
149 >      ;;
150      esac
151 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
152 <    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
153 <  Linux-ppc64*)
151 >    export CC=`which gcc` CXX=`which g++`
152 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
153 >  slc*_ppc64*)
154      ./configure linux $CONFIG_ARGS --disable-rfio;;
155   esac
156  
# Line 124 | Line 162 | case %cmsplatf in
162     makeopts="%makeprocesses"
163    ;;
164   esac
165 <
166 < make $makeopts
165 >
166 > make $makeopts
167   make cintdlls
168  
169   %install
# Line 144 | Line 182 | export ROOTSYS=%i
182   make INSTALL="$cp" INSTALLDATA="$cp" install
183   mkdir -p $ROOTSYS/lib/python
184   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
185 + # This file confuses rpm's find-requires because it starts with
186 + # a """ and it thinks is the shebang.
187 + rm -f %i/tutorials/pyroot/mrt.py
188  
189   # SCRAM ToolBox toolfile
190   mkdir -p %i/etc/scram.d

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines