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.105 by ratnik, Fri Mar 7 23:43:18 2008 UTC vs.
Revision 1.107 by dlange, Sat Mar 8 02:24:13 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS18l
1 > ### RPM lcg root 5.18.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
5 < #Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
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 >
7 > Patch0: root-5.18-00-libpng
8 > Patch1: root-5.18-00a-CINT-maxlongline
9 > Patch2: root_5.18-00-CINTFunctional
10 > Patch3: root-5.18-00a-TBufferXML
11 > Patch4: root-5.18-00a-Cintex
12  
7 Patch: root-CINT-maxlongline
8 Patch1: root_libpng
9 Patch2: root_PositionVector
10 Patch3: root-fastmerge-ttree
11 Patch4: root_TXMLSetup
12 Patch5: root-Cintex
13 Patch6: root_Reflex_Cintex
14 Patch7: root_CallFunc
15 # The following patch should only be applied for gcc4.x (x>0) and when
16 # using gccxml 0.7.0
17 Patch9: root_5.14_reflex_gccxml070_update
18 Patch10: root-5.14-xrootd-20071001-0000a
19 Patch11: root-5.14-silence-tmva
20 Patch12: root_5.14-CINTFunctional
21 Patch13: root_5.14-streamerinfo
13  
14   %define cpu %(echo %cmsplatf | cut -d_ -f2)
15   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
16  
17 < Requires: gccxml
27 < Requires: python
28 < Requires: gsl
29 < Requires: castor
30 < Requires: libjpg
31 < Requires: dcap
32 < Requires: pcre
17 > Requires: gccxml gsl castor libjpg dcap pcre python
18  
19   %if "%{?online_release:set}" != "set"
20 < Requires: qt
36 < Requires: openssl
37 < Requires: mysql
38 < Requires: libpng
39 < Requires: zlib
40 < Requires: oracle
41 < Requires: libungif
42 < Requires: xrootd
20 > Requires: qt openssl mysql libpng zlib oracle libungif xrootd
21   %else
22   %define skiplibtiff true
23   %endif
# Line 54 | Line 32 | Requires: libtiff
32  
33   %prep
34   %setup -n root
35 < %patch -p0
36 < %patch1 -p2
37 < %patch2 -p2
35 > %patch0 -p1
36 > %patch1 -p1
37 > %patch2 -p0
38   %patch3 -p1
39   %patch4 -p0
62 %patch5 -p1
63 %patch6 -p0
64 %patch7 -p0
65 %if "%cmsplatf" == "slc4_ia32_gcc412"
66 %patch9 -p1
67 %endif
68 %patch10 -p1
69 %patch11 -p1
70 %patch12 -p0
71 %patch13 -p0
40  
41   %build
42   mkdir -p %i
43   export ROOTSYS=%_builddir/root
44  
77
45   %if "%{?online_release:set}" == "set"
46   # Use oracle from xdaq installation:
47   ORACLE_ROOT="/opt/xdaq"
48 < # Build without mysql, and use system qt and openssl.
82 < # Also skip xrootd for online case:
48 > # Build without mysql, and use system qt and openssl:
49   EXTRA_CONFIG_ARGS="
50 <             --disable-mysql
51 <             --disable-xrootd
52 <             --disable-odbc
53 <             --enable-qt"
50 >             --disable-mysql
51 >             --enable-qt
52 >             --enable-ssl"
53 > # Also skip xrootd option for online case.
54   %else
55   EXTRA_CONFIG_ARGS="
56 <   --with-xrootd=$XROOTD_ROOT
57 <   --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
58 <   --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
59 <   --with-ssl-incdir=${OPENSSL_ROOT}/include
60 <   --with-ssl-libdir=${OPENSSL_ROOT}/lib"
56 >             --with-xrootd=$XROOTD_ROOT
57 >             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
58 >             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
59 >             --with-ssl-incdir=${OPENSSL_ROOT}/include
60 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
61   %endif
62  
63   CONFIG_ARGS="--enable-table
# Line 117 | Line 83 | CONFIG_ARGS="--enable-table
83               --disable-pgsql
84               --disable-xml ${EXTRA_CONFIG_ARGS}"
85  
86 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_amd64_gcc345"))
86 > %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
87    CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
88   %endif
89  
# Line 161 | Line 127 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
127   <info url="http://root.cern.ch/root/"></info>
128   <lib name=Cint>
129   <lib name=Core>
130 + <lib name=RIO>
131 + <lib name=Net>
132   <lib name=Tree>
133   <Client>
134   <Environment name=ROOTCORE_BASE default="%i"></Environment>
# Line 285 | Line 253 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
253   <doc type=BuildSystem::ToolDoc version=1.0>
254   <Tool name=rootroofit version=%v>
255   <info url="http://root.cern.ch/root/"></info>
256 + <lib name=RooFitCore>
257   <lib name=RooFit>
258   <use name=ROOTMinuit>
259   <use name=ROOTHtml>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines