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.169 by elmer, Tue Jul 7 15:06:48 2009 UTC vs.
Revision 1.183 by elmer, Thu Nov 12 19:17:39 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)
7 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; 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
25 < Patch16: root-5.22-00a-gcc44
26 < Patch17: root-5.22-00a-fireworks2
27 < Patch18: root-5.22-00a-fireworks3
28 < Patch19: root-5.22-00a-TBranchElement
29 < Patch20: root-5.22-00a-tmplt
30 < Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
31 < Patch22: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
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 > Patch16: root-5.22-00d-genreflex_python26_popen3
26 > Patch17: root-5.22-00d-fireworks6
27 > Patch18: root-5.22-00d-linker-gnu-hash-style
28  
29   %define cpu %(echo %cmsplatf | cut -d_ -f2)
34 %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
30  
31   Requires: gccxml gsl castor libjpg dcap pcre python
32  
33   %if "%online" != "true"
34 < Requires: qt openssl mysql libpng zlib libungif xrootd
34 > Requires: qt openssl libpng zlib libungif xrootd
35   %else
36   %define skiplibtiff true
37   %endif
# Line 56 | Line 51 | Requires: libtiff
51   %patch2 -p1
52   %patch3 -p1
53   %patch4 -p1
54 +
55   %patch5 -p1
56   %patch6 -p1
57 < %patch7 -p0
58 < %patch8 -p0
57 > %patch7 -p1
58 > %patch8 -p1
59   %patch9 -p1
60 < %patch10 -p1
60 >
61 > # patch10 is compiler version dependent, see below
62   %patch11 -p1
63   %patch12 -p1
64 < %patch13 -p1
65 < %patch14 -p0
69 < %patch15 -p0
70 < # patch16 is compiler version dependent, see below
71 < %patch17 -p1
72 < %patch18 -p1
73 < %patch19 -p0
74 < %patch20 -p0
75 < %patch21 -p0
64 > # patch13 is compiler version dependent, see below
65 >
66   # work around patch issue...
67   rm graf3d/gl/src/gl2ps.c
68 < # patch22 is compiler version dependent, see below
68 > %patch14 -p1
69 > #work around patch issues in patch14(?)
70 > rm graf3d/eve/inc/TEveLegoOverlay.h.orig
71 > rm graf3d/eve/src/TEveLegoOverlay.cxx
72 > rm graf3d/gl/inc/gl2ps.h.orig
73 > rm graf3d/gl/src/gl2ps.c.orig
74 > %patch15 -p1
75 > %patch16 -p1
76 > %patch17 -p1
77  
78   case %gccver in
79    4.3.*)
80 < %patch22 -p1
80 > %patch13 -p1
81    ;;
82    4.4.*)
83 < %patch16 -p1
83 > %patch10 -p1
84 >  ;;
85 > esac
86 >
87 > # The following patch can only be applied on SLC5 or later (extra linker
88 > # options only available with the SLC5 binutils)
89 > case %cmsplatf in
90 >  slc5_* | slc5onl_* )
91 > %patch18 -p1
92    ;;
93   esac
94  
# Line 90 | Line 96 | esac
96  
97   mkdir -p %i
98   export ROOTSYS=%_builddir/root
99 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
100  
101   %if "%online" == "true"
102 < # Build without mysql, and use system qt.
96 < # Also skip xrootd and odbc for online case:
102 > # Use system qt. Also skip xrootd and odbc for online case:
103  
104   EXTRA_CONFIG_ARGS="--with-f77=/usr
99             --disable-mysql
105               --disable-xrootd
106               --disable-odbc
107               --disable-qt --disable-qtgsi"
108   %else
109   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
110               --with-xrootd=$XROOTD_ROOT
106             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
111               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
112               --with-ssl-incdir=${OPENSSL_ROOT}/include
113               --with-ssl-libdir=${OPENSSL_ROOT}/lib
# Line 115 | Line 119 | CONFIG_ARGS="--enable-table
119               --disable-builtin-freetype
120               --disable-builtin-zlib
121               --with-gccxml=${GCCXML_ROOT}
122 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
122 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
123               --enable-explicitlink
124               --enable-mathmore
125               --enable-reflex  
126               --enable-cintex
127               --enable-minuit2
124             --enable-roofit
128               --disable-ldap
129               --disable-krb5
130               --with-gsl-incdir=${GSL_ROOT}/include
# Line 129 | Line 132 | CONFIG_ARGS="--enable-table
132               --with-dcap-libdir=${DCAP_ROOT}/lib
133               --with-dcap-incdir=${DCAP_ROOT}/include
134               --disable-pgsql
135 +             --disable-mysql
136               --disable-xml ${EXTRA_CONFIG_ARGS}"
137  
138 < #case %gccver in
135 < #  4.*)
136 < #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
137 < #  ;;
138 < #esac
139 <
140 < case $(uname)-$(uname -p) in
138 > case $(uname)-$(uname -m) in
139    Linux-x86_64)
140      ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
141    Linux-i*86)
# Line 348 | Line 346 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
346   </Tool>
347   EOF_TOOLFILE
348  
351 # rootroofit toolfile
352 cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
353 <doc type=BuildSystem::ToolDoc version=1.0>
354 <Tool name=rootroofit version=%v>
355 <info url="http://root.cern.ch/root/"></info>
356 <lib name=RooFit>
357 <lib name=RooFitCore>
358 <use name=ROOTMinuit>
359 </Tool>
360 EOF_TOOLFILE
361
349   # rootmlp toolfile
350   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp
351   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 402 | Line 389 | EOF_TOOLFILE
389   %{relocateConfig}etc/scram.d/rootminuit2
390   %{relocateConfig}etc/scram.d/rootrflx
391   %{relocateConfig}etc/scram.d/roothtml
405 %{relocateConfig}etc/scram.d/rootroofit
392   %{relocateConfig}etc/scram.d/rootmlp
393   %{relocateConfig}etc/scram.d/roottmva
394   %{relocateConfig}etc/scram.d/rootthread

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines