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.80 by elmer, Tue Nov 20 21:41:17 2007 UTC vs.
Revision 1.93 by elmer, Fri Jan 18 21:22:01 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS18
1 > ### RPM lcg root 5.18.00-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 < # 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
7 > Patch0: root-5.18-00-libpng
8 > Patch1: root-5.18-00-CINT-maxlongline
9  
10   %define cpu %(echo %cmsplatf | cut -d_ -f2)
11   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 27 | Line 17 | Requires: libtiff
17  
18   %prep
19   %setup -n root
20 < %patch -p0
21 < %patch1 -p2
32 < %patch2 -p2
33 < %patch3 -p1
34 < %patch4 -p0
35 < %patch5 -p1
36 < %patch6 -p0
37 < %patch7 -p0
38 < %if "%cmsplatf" == "slc4_ia32_gcc412"
39 < %patch9 -p1
40 < %endif
41 < %patch10 -p1
20 > %patch0 -p1
21 > %patch1 -p1
22  
23   %build
24   mkdir -p %i
# Line 71 | Line 51 | CONFIG_ARGS="--enable-table
51               --disable-pgsql
52               --disable-xml"
53  
54 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_amd64_gcc345"))
54 > %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
55    CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
56   %endif
57  
# Line 115 | Line 95 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
95   <info url="http://root.cern.ch/root/"></info>
96   <lib name=Cint>
97   <lib name=Core>
98 + <lib name=RIO>
99 + <lib name=Net>
100   <lib name=Tree>
101   <Client>
102   <Environment name=ROOTCORE_BASE default="%i"></Environment>
# Line 239 | Line 221 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
221   <doc type=BuildSystem::ToolDoc version=1.0>
222   <Tool name=rootroofit version=%v>
223   <info url="http://root.cern.ch/root/"></info>
224 + <lib name=RooFitCore>
225   <lib name=RooFit>
226   <use name=ROOTMinuit>
227   <use name=ROOTHtml>

Diff Legend

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