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.136 by elmer, Sat Jan 24 21:36:12 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 > Patch2:  root-5.22-00-TClass-Clone
10 > Patch3:  root-5.22-00-gendict
11 > Patch4:  root-5.22-00-RootSys
12 > Patch5:  root-5.22-00-TMVA-shut-the-hell-up-for-once
13 > Patch6:  root-5.22-00-TBranchElement_initializeoffsets
14 > Patch7:  root-5.22-00-TBranchElement-pcanal
15  
16   %define cpu %(echo %cmsplatf | cut -d_ -f2)
17   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 23 | Line 19 | Patch1:  root-5.21-04-CINT-maxlongline
19   Requires: gccxml gsl castor libjpg dcap pcre python
20  
21   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
22 < Requires: qt openssl mysql libpng zlib libungif xrootd
22 > Requires: qt openssl mysql libpng zlib libungif
23   %else
24   %define skiplibtiff true
25   %endif
# Line 40 | Line 36 | Requires: libtiff
36   %setup -n root
37   %patch0 -p1
38   %patch1 -p1
39 < #%patch2 -p0
40 < #%patch3 -p1
41 < #%patch4 -p0
42 < #%patch5 -p0
43 < #%patch6 -p0
44 < #%patch7 -p0
49 < #%patch8 -p1
50 < #%patch9 -p0
51 < #%patch10 -p0
52 < #%patch11 -p0
39 > %patch2 -p1
40 > %patch3 -p1
41 > %patch4 -p1
42 > %patch5 -p1
43 > %patch6 -p0
44 > %patch7 -p1
45  
46   %build
47   mkdir -p %i
# Line 81 | Line 73 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
73               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
74               --enable-explicitlink
75               --enable-qtgsi
84             --enable-mathcore
76               --enable-mathmore
77               --enable-reflex  
78               --enable-cintex
# Line 96 | Line 87 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
87               --disable-pgsql
88               --disable-xml ${EXTRA_CONFIG_ARGS}"
89  
90 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
91 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
92 < %endif
90 > #case %gccver in
91 > #  4.*)
92 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
93 > #  ;;
94 > #esac
95  
96   case $(uname)-$(uname -p) in
97    Linux-x86_64)
98 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
98 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
99    Linux-i*86)
100      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
101    Darwin*)
# Line 237 | Line 230 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
230   <info url="http://root.cern.ch/root/"></info>
231   <lib name=MathCore>
232   <lib name=MathMore>
233 + <lib name=GenVector>
234   <use name=ROOTCore>
235   <use name=gsl>
236   </Tool>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines