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.144 by elmer, Thu Feb 12 19:46:01 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.21.04
1 > ### RPM lcg root 5.22.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
# 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 > Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
10  
11   %define cpu %(echo %cmsplatf | cut -d_ -f2)
12   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 23 | Line 14 | Patch1:  root-5.21-04-CINT-maxlongline
14   Requires: gccxml gsl castor libjpg dcap pcre python
15  
16   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
17 < Requires: qt openssl mysql libpng zlib libungif xrootd
17 > Requires: qt openssl mysql libpng zlib libungif
18   %else
19   %define skiplibtiff true
20   %endif
# Line 40 | Line 31 | Requires: libtiff
31   %setup -n root
32   %patch0 -p1
33   %patch1 -p1
34 < #%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
34 > %patch2 -p1
35  
36   %build
37   mkdir -p %i
# Line 81 | Line 63 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
63               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
64               --enable-explicitlink
65               --enable-qtgsi
84             --enable-mathcore
66               --enable-mathmore
67               --enable-reflex  
68               --enable-cintex
# Line 96 | Line 77 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
77               --disable-pgsql
78               --disable-xml ${EXTRA_CONFIG_ARGS}"
79  
80 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
81 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
82 < %endif
80 > #case %gccver in
81 > #  4.*)
82 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
83 > #  ;;
84 > #esac
85  
86   case $(uname)-$(uname -p) in
87    Linux-x86_64)
88 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
88 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
89    Linux-i*86)
90      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
91    Darwin*)
# Line 237 | Line 220 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
220   <info url="http://root.cern.ch/root/"></info>
221   <lib name=MathCore>
222   <lib name=MathMore>
223 + <lib name=GenVector>
224   <use name=ROOTCore>
225   <use name=gsl>
226   </Tool>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines