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.73 by dlange, Mon Oct 15 12:31:04 2007 UTC vs.
Revision 1.87 by elmer, Mon Jan 7 22:27:12 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS11
1 > ### RPM lcg root 5.17.08-CMS19
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 < 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 < Patch8: root-proofd
7 > Patch0: root-5.17-08-Cintex
8 > Patch1: root-5.17-08-libpng
9 > Patch2: root-5.17-08-CINT-maxlongline
10  
11   %define cpu %(echo %cmsplatf | cut -d_ -f2)
12   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 24 | Line 18 | Requires: libtiff
18  
19   %prep
20   %setup -n root
21 < %patch -p0
22 < %patch1 -p2
23 < %patch2 -p2
30 < %patch3 -p1
31 < %patch4 -p0
32 < %patch5 -p1
33 < %patch6 -p0
34 < %patch7 -p0
35 < %patch8 -p1
21 > %patch0 -p1
22 > %patch1 -p1
23 > %patch2 -p1
24  
25   %build
26   mkdir -p %i
# Line 65 | Line 53 | CONFIG_ARGS="--enable-table
53               --disable-pgsql
54               --disable-xml"
55  
56 + %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
57 +  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
58 + %endif
59 +
60   case $(uname)-$(uname -p) in
61    Linux-x86_64)
62      ./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;;
# Line 105 | Line 97 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
97   <info url="http://root.cern.ch/root/"></info>
98   <lib name=Cint>
99   <lib name=Core>
100 + <lib name=RIO>
101 + <lib name=Net>
102   <lib name=Tree>
103   <Client>
104   <Environment name=ROOTCORE_BASE default="%i"></Environment>
# Line 229 | Line 223 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
223   <doc type=BuildSystem::ToolDoc version=1.0>
224   <Tool name=rootroofit version=%v>
225   <info url="http://root.cern.ch/root/"></info>
226 + <lib name=RooFitCore>
227   <lib name=RooFit>
228   <use name=ROOTMinuit>
229   <use name=ROOTHtml>

Diff Legend

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