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.126 by lsexton, Fri Nov 21 16:43:38 2008 UTC vs.
Revision 1.130 by elmer, Tue Jan 13 19:44:39 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.21.04
1 > ### RPM lcg root 5.22.00
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.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 – #Patch6:  root-5.18-00a-TBufferFile
14 – #Patch7:  root-5.18-00a-cintexquickfix2
15 – #Patch8:  root-5.18-00a-gendict-performance
16 – #Patch9:  root-5.18-00a-TClass-classNameSize
17 – #Patch10: root-5.18-00a-TFile-stlStreamerInfo
18 – #Patch11: root-5.18-00-cintex_functional_mmap
9  
10   %define cpu %(echo %cmsplatf | cut -d_ -f2)
11   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 23 | Line 13 | Patch1:  root-5.21-04-CINT-maxlongline
13   Requires: gccxml gsl castor libjpg dcap pcre python
14  
15   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
16 < Requires: qt openssl mysql libpng zlib libungif xrootd
16 > Requires: qt openssl mysql libpng zlib libungif
17   %else
18   %define skiplibtiff true
19   %endif
# Line 40 | Line 30 | Requires: libtiff
30   %setup -n root
31   %patch0 -p1
32   %patch1 -p1
43 – #%patch2 -p0
44 – #%patch3 -p1
45 – #%patch4 -p0
46 – #%patch5 -p0
47 – #%patch6 -p0
48 – #%patch7 -p0
49 – #%patch8 -p1
50 – #%patch9 -p0
51 – #%patch10 -p0
52 – #%patch11 -p0
33  
34   %build
35   mkdir -p %i
# Line 81 | Line 61 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
61               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
62               --enable-explicitlink
63               --enable-qtgsi
84 –             --enable-mathcore
64               --enable-mathmore
65               --enable-reflex  
66               --enable-cintex
# Line 96 | Line 75 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
75               --disable-pgsql
76               --disable-xml ${EXTRA_CONFIG_ARGS}"
77  
78 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
79 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
80 < %endif
78 > #case %gccver in
79 > #  4.*)
80 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
81 > #  ;;
82 > #esac
83  
84   case $(uname)-$(uname -p) in
85    Linux-x86_64)
# Line 237 | Line 218 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
218   <info url="http://root.cern.ch/root/"></info>
219   <lib name=MathCore>
220   <lib name=MathMore>
221 + <lib name=GenVector>
222   <use name=ROOTCore>
223   <use name=gsl>
224   </Tool>

Diff Legend

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