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.75 by ratnik, Tue Oct 16 08:38:00 2007 UTC vs.
Revision 1.111 by ratnik, Mon Apr 7 21:01:51 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS9
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 > Patch5: root-5.18-00a-Cintex2
13  
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
14  
15   %define cpu %(echo %cmsplatf | cut -d_ -f2)
16   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 17 | Line 18 | Patch5: root-Cintex
18   Requires: gccxml gsl castor libjpg dcap pcre python
19  
20   %if "%{?online_release:set}" != "set"
21 < Requires: qt openssl mysql libpng zlib oracle libungif
21 > Requires: qt openssl mysql libpng zlib libungif xrootd
22   %else
23   %define skiplibtiff true
24   %endif
# Line 32 | Line 33 | Requires: libtiff
33  
34   %prep
35   %setup -n root
36 < %patch -p0
37 < %patch1 -p2
38 < %patch2 -p2
36 > %patch0 -p1
37 > %patch1 -p1
38 > %patch2 -p0
39   %patch3 -p1
40   %patch4 -p0
41 < %patch5 -p1
41 > %patch5 -p0
42 >
43   %build
44   mkdir -p %i
45   export ROOTSYS=%_builddir/root
46  
47 < %if "%{?online_release:set}" != "set"
47 > %if "%{?online_release:set}" == "set"
48 > # Build without mysql, and use system qt.
49 > # Also skip xrootd and odbc for online case:
50 >
51   EXTRA_CONFIG_ARGS="
52 < --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
53 < --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
54 < --with-ssl-incdir=${OPENSSL_ROOT}/include
55 < --with-ssl-libdir=${OPENSSL_ROOT}/lib"
52 >             --disable-mysql
53 >             --disable-xrootd
54 >             --disable-odbc
55 >             --enable-qt"
56   %else
57 < ORACLE_ROOT="/opt/xdaq"
58 < EXTRA_CONFIG_ARGS=" --enable-ssl"
57 > EXTRA_CONFIG_ARGS="
58 >             --with-xrootd=$XROOTD_ROOT
59 >             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
60 >             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
61 >             --with-ssl-incdir=${OPENSSL_ROOT}/include
62 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
63   %endif
64  
65   CONFIG_ARGS="--enable-table
# Line 58 | Line 67 | CONFIG_ARGS="--enable-table
67               --disable-builtin-freetype
68               --disable-builtin-zlib
69               --with-gccxml=${GCCXML_ROOT}
70 <             --enable-python
62 <             --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
63 <             --enable-mysql
70 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
71               --enable-explicitlink
72               --enable-qtgsi
66 –             --enable-qt
73               --enable-mathcore
74               --enable-mathmore
75               --enable-reflex  
# Line 79 | Line 85 | CONFIG_ARGS="--enable-table
85               --disable-pgsql
86               --disable-xml ${EXTRA_CONFIG_ARGS}"
87  
88 + %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
89 +  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
90 + %endif
91 +
92   case $(uname)-$(uname -p) in
93    Linux-x86_64)
94 <    ./configure linuxx8664gcc $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
94 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
95    Linux-i*86)
96 <    ./configure linux  $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
96 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
97    Darwin*)
98      ./configure macosx $CONFIG_ARGS --disable-rfio;;
99    Linux-ppc64*)
# Line 119 | Line 129 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
129   <info url="http://root.cern.ch/root/"></info>
130   <lib name=Cint>
131   <lib name=Core>
132 + <lib name=RIO>
133 + <lib name=Net>
134   <lib name=Tree>
135   <Client>
136   <Environment name=ROOTCORE_BASE default="%i"></Environment>
# Line 243 | Line 255 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
255   <doc type=BuildSystem::ToolDoc version=1.0>
256   <Tool name=rootroofit version=%v>
257   <info url="http://root.cern.ch/root/"></info>
258 + <lib name=RooFitCore>
259   <lib name=RooFit>
260   <use name=ROOTMinuit>
261   <use name=ROOTHtml>

Diff Legend

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