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.136 by elmer, Sat Jan 24 21:36:12 2009 UTC vs.
Revision 1.146 by elmer, Fri Feb 13 16:39:24 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00
1 > ### RPM lcg root 5.22.00a
2   ## INITENV +PATH PYTHONPATH %i/lib/python
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
# Line 6 | Line 6 | Source: ftp://root.cern.ch/%n/%{n}_v%{re
6  
7   Patch0:  root-5.18-00-libpng
8   Patch1:  root-5.21-04-CINT-maxlongline
9 < Patch2:  root-5.22-00-TClass-Clone
10 < Patch3:  root-5.22-00-gendict
11 < Patch4:  root-5.22-00-RootSys
12 < Patch5:  root-5.22-00-TMVA-shut-the-hell-up-for-once
13 < Patch6:  root-5.22-00-TBranchElement_initializeoffsets
14 < Patch7:  root-5.22-00-TBranchElement-pcanal
9 > Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
10  
11   %define cpu %(echo %cmsplatf | cut -d_ -f2)
12   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 19 | Line 14 | Patch7:  root-5.22-00-TBranchElement-pca
14   Requires: gccxml gsl castor libjpg dcap pcre python
15  
16   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
17 < Requires: qt openssl mysql libpng zlib libungif
17 > Requires: qt openssl mysql libpng zlib libungif xrootd
18   %else
19   %define skiplibtiff true
20   %endif
# Line 37 | Line 32 | Requires: libtiff
32   %patch0 -p1
33   %patch1 -p1
34   %patch2 -p1
40 %patch3 -p1
41 %patch4 -p1
42 %patch5 -p1
43 %patch6 -p0
44 %patch7 -p1
35  
36   %build
37   mkdir -p %i
# Line 58 | Line 48 | EXTRA_CONFIG_ARGS="
48               --enable-qt"
49   %else
50   EXTRA_CONFIG_ARGS="
51 +             --with-xrootd=$XROOTD_ROOT
52               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
53               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
54               --with-ssl-incdir=${OPENSSL_ROOT}/include
# Line 209 | Line 200 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
200   </Tool>
201   EOF_TOOLFILE
202  
203 < # rootinteractive toolfile
203 > # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
204 > # have been removed for the moment)
205   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
206   <doc type=BuildSystem::ToolDoc version=1.0>
207   <Tool name=rootinteractive version=%v>
208   <info url="http://root.cern.ch/root/"></info>
209   <lib name=Rint>
210 + <use name=libjpg>
211 + <use name=libpng>
212 + <use name=ROOT>
213 + </Tool>
214 + EOF_TOOLFILE
215 +
216 + # rootinteractive2 toolfile (temporary, to allow access to Qt4)
217 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
218 + <doc type=BuildSystem::ToolDoc version=1.0>
219 + <Tool name=rootinteractive2 version=%v>
220 + <info url="http://root.cern.ch/root/"></info>
221 + <lib name=Rint>
222   <lib name=GQt>
223   <use name=qt>
224   <use name=libjpg>
# Line 223 | Line 227 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
227   </Tool>
228   EOF_TOOLFILE
229  
230 +
231   # rootmath toolfile
232   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
233   <doc type=BuildSystem::ToolDoc version=1.0>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines