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.157 by dlange, Tue May 5 03:19:51 2009 UTC vs.
Revision 1.178 by elmer, Mon Sep 21 14:58:38 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00a
1 > ### RPM lcg root 5.22.00d
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3 < ## INITENV SET ROOTSYS %i
3 > ## INITENV SET ROOTSYS %i
4   #Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %realversion | tr . -)&module=root&output=/%{n}_v%{realversion}.source.tar.gz
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 flase;; esac)
8  
9   Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
11   Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
12   Patch3:  root-5.22-00a-TMVA-shut-the-hell-up-again
13 < Patch4:  root-5.22-00a-CINTFunctional
14 < Patch5:  root-5.22-00a-TClass
15 < Patch6:  root-5.22-00a-fireworks-graf3d-gui
16 < Patch7:  root-5.22-00a-Reflex-Class
17 < Patch8:  root-5.22-00a-Cintex
18 < Patch9:  root-5.22-00a-roofit-silence-static-printout
19 < Patch10: root-5.22-00a-TMVA-just-shut-the-hell-up
20 < Patch11: root-5.22-00a-th1
21 < Patch12: root-5.22-00a-smatrix
22 < Patch13: root-5.22-00a-fireworks1
23 < Patch14: root-5.22-00a-Reflex-gendict_selclass
24 < Patch15: root-5.22-00a-MatrixInversion
13 > Patch4:  root-5.22-00d-fireworks-graf3d-gui
14 > Patch5:  root-5.22-00a-roofit-silence-static-printout
15 > Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
16 > Patch7: root-5.22-00a-th1
17 > Patch8: root-5.22-00a-smatrix
18 > Patch9: root-5.22-00a-fireworks1
19 > Patch10: root-5.22-00a-gcc44
20 > Patch11: root-5.22-00a-fireworks2
21 > Patch12: root-5.22-00a-fireworks3
22 > Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
23 > Patch14: root-5.22-00a-fireworks4
24 > Patch15: root-5.22-00d-fireworks5
25  
26   %define cpu %(echo %cmsplatf | cut -d_ -f2)
27   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
28  
29   Requires: gccxml gsl castor libjpg dcap pcre python
30  
31 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
31 > %if "%online" != "true"
32   Requires: qt openssl mysql libpng zlib libungif xrootd
33   %else
34   %define skiplibtiff true
# Line 47 | Line 49 | Requires: libtiff
49   %patch2 -p1
50   %patch3 -p1
51   %patch4 -p1
52 +
53   %patch5 -p1
54   %patch6 -p1
55 < %patch7 -p0
56 < %patch8 -p0
55 > %patch7 -p1
56 > %patch8 -p1
57   %patch9 -p1
58 < %patch10 -p1
58 >
59 > # patch10 is compiler version dependent, see below
60   %patch11 -p1
61   %patch12 -p1
62 + # patch13 is compiler version dependent, see below
63 +
64 + # work around patch issue...
65 + rm graf3d/gl/src/gl2ps.c
66 + %patch14 -p1
67 + #work around patch issues in patch14(?)
68 + rm graf3d/eve/inc/TEveLegoOverlay.h.orig
69 + rm graf3d/eve/src/TEveLegoOverlay.cxx
70 + rm graf3d/gl/inc/gl2ps.h.orig
71 + rm graf3d/gl/src/gl2ps.c.orig
72 + %patch15 -p1
73 +
74 + case %gccver in
75 +  4.3.*)
76   %patch13 -p1
77 < %patch14 -p0
78 < %patch15 -p0
77 >  ;;
78 >  4.4.*)
79 > %patch10 -p1
80 >  ;;
81 > esac
82  
83   %build
84 +
85   mkdir -p %i
86   export ROOTSYS=%_builddir/root
87  
88 < %if "%cmsplatf" == "slc4onl_ia32_gcc346"
88 > %if "%online" == "true"
89   # Build without mysql, and use system qt.
90   # Also skip xrootd and odbc for online case:
91  
92 < EXTRA_CONFIG_ARGS="
92 > EXTRA_CONFIG_ARGS="--with-f77=/usr
93               --disable-mysql
94               --disable-xrootd
95               --disable-odbc
96 <             --enable-qt"
96 >             --disable-qt --disable-qtgsi"
97   %else
98 < EXTRA_CONFIG_ARGS="
98 > EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
99               --with-xrootd=$XROOTD_ROOT
100               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
101               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
102               --with-ssl-incdir=${OPENSSL_ROOT}/include
103 <             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
103 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib
104 >             --enable-qtgsi"
105   %endif
106  
107 < CONFIG_ARGS="--with-f77=${GCC_ROOT}
85 <             --enable-table
107 > CONFIG_ARGS="--enable-table
108               --disable-builtin-pcre
109               --disable-builtin-freetype
110               --disable-builtin-zlib
111               --with-gccxml=${GCCXML_ROOT}
112               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
113               --enable-explicitlink
92 –             --enable-qtgsi
114               --enable-mathmore
115               --enable-reflex  
116               --enable-cintex
117               --enable-minuit2
97 –             --enable-roofit
118               --disable-ldap
119               --disable-krb5
120               --with-gsl-incdir=${GSL_ROOT}/include
# Line 116 | Line 136 | case $(uname)-$(uname -p) in
136    Linux-i*86)
137      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
138    Darwin*)
139 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
139 >    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
140    Linux-ppc64*)
141      ./configure linux $CONFIG_ARGS --disable-rfio;;
142   esac
# Line 194 | Line 214 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
214   <doc type=BuildSystem::ToolDoc version=1.0>
215   <Tool name=roothistmatrix version=%v>
216   <info url="http://root.cern.ch/root/"></info>
197 – <lib name=Gpad>
198 – <lib name=Graf>
217   <lib name=Hist>
218   <lib name=Matrix>
219   <use name=ROOTCore>
220   </Tool>
221   EOF_TOOLFILE
222  
223 + # rootgpad toolfile
224 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
225 + <doc type=BuildSystem::ToolDoc version=1.0>
226 + <Tool name=rootgpad version=%v>
227 + <info url="http://root.cern.ch/root/"></info>
228 + <lib name=Gpad>
229 + <lib name=Graf>
230 + <use name=roothistmatrix>
231 + </Tool>
232 + EOF_TOOLFILE
233 +
234   # rootphysics toolfile
235   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
236   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 220 | Line 249 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
249   <lib name=TreePlayer>
250   <lib name=Graf3d>
251   <lib name=Postscript>
252 < <use name=ROOTPhysics>
252 > <use name=rootgpad>
253   </Tool>
254   EOF_TOOLFILE
255  
# Line 247 | Line 276 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
276   <use name=qt>
277   <use name=libjpg>
278   <use name=libpng>
279 < <use name=ROOT>
279 > <use name=rootgpad>
280   </Tool>
281   EOF_TOOLFILE
282  
# Line 269 | Line 298 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
298   <Tool name=rootminuit version=%v>
299   <info url="http://root.cern.ch/root/"></info>
300   <lib name=Minuit>
301 < <use name=ROOT>
301 > <use name=rootgpad>
302   </Tool>
303   EOF_TOOLFILE
304  
# Line 279 | Line 308 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
308   <Tool name=rootminuit2 version=%v>
309   <info url="http://root.cern.ch/root/"></info>
310   <lib name=Minuit2>
311 < <use name=ROOT>
311 > <use name=rootgpad>
312   </Tool>
313   EOF_TOOLFILE
314  
# Line 308 | Line 337 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
337   <Tool name=roothtml version=%v>
338   <info url="http://root.cern.ch/root/"></info>
339   <lib name=Html>
340 < <use name=RootHistMatrix>
312 < </Tool>
313 < EOF_TOOLFILE
314 <
315 < # rootroofit toolfile
316 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
317 < <doc type=BuildSystem::ToolDoc version=1.0>
318 < <Tool name=rootroofit version=%v>
319 < <info url="http://root.cern.ch/root/"></info>
320 < <lib name=RooFit>
321 < <lib name=RooFitCore>
322 < <use name=ROOTMinuit>
323 < <use name=ROOTHtml>
340 > <use name=rootgpad>
341   </Tool>
342   EOF_TOOLFILE
343  
# Line 341 | Line 358 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
358   <info url="http://root.cern.ch/root/"></info>
359   <lib name=TMVA>
360   <use name=ROOTMLP>
361 + <use name=rootminuit>
362   </Tool>
363   EOF_TOOLFILE
364  
# Line 366 | Line 384 | EOF_TOOLFILE
384   %{relocateConfig}etc/scram.d/rootminuit2
385   %{relocateConfig}etc/scram.d/rootrflx
386   %{relocateConfig}etc/scram.d/roothtml
369 – %{relocateConfig}etc/scram.d/rootroofit
387   %{relocateConfig}etc/scram.d/rootmlp
388   %{relocateConfig}etc/scram.d/roottmva
389   %{relocateConfig}etc/scram.d/rootthread

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines