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.123 by andreasp, Wed Aug 27 19:07:52 2008 UTC vs.
Revision 1.137 by elmer, Mon Jan 26 22:17:02 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.18.00a
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
5   Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6  
7 < Patch0: root-5.18-00-libpng
8 < Patch1: root-5.18-00a-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
7 > Patch0:  root-5.18-00-libpng
8 > Patch1:  root-5.21-04-CINT-maxlongline
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 > Patch8:  root-5.22-00-TTreeCloner-CollectBranches-fix
16  
17   %define cpu %(echo %cmsplatf | cut -d_ -f2)
18   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 21 | Line 20 | Patch9: root-5.18-00a-TClass-classNameSi
20   Requires: gccxml gsl castor libjpg dcap pcre python
21  
22   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
23 < Requires: qt openssl mysql libpng zlib libungif xrootd
23 > Requires: qt openssl mysql libpng zlib libungif
24   %else
25   %define skiplibtiff true
26   %endif
# Line 38 | Line 37 | Requires: libtiff
37   %setup -n root
38   %patch0 -p1
39   %patch1 -p1
40 < %patch2 -p0
40 > %patch2 -p1
41   %patch3 -p1
42 < %patch4 -p0
43 < %patch5 -p0
42 > %patch4 -p1
43 > %patch5 -p1
44   %patch6 -p0
45 < %patch7 -p0
45 > %patch7 -p1
46   %patch8 -p1
48 %patch9 -p0
47  
48   %build
49   mkdir -p %i
# Line 62 | Line 60 | EXTRA_CONFIG_ARGS="
60               --enable-qt"
61   %else
62   EXTRA_CONFIG_ARGS="
65             --with-xrootd=$XROOTD_ROOT
63               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
64               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
65               --with-ssl-incdir=${OPENSSL_ROOT}/include
66               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
67   %endif
68  
69 < CONFIG_ARGS="--enable-table
69 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
70 >             --enable-table
71               --disable-builtin-pcre
72               --disable-builtin-freetype
73               --disable-builtin-zlib
# Line 77 | Line 75 | CONFIG_ARGS="--enable-table
75               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
76               --enable-explicitlink
77               --enable-qtgsi
80             --enable-mathcore
78               --enable-mathmore
79               --enable-reflex  
80               --enable-cintex
# Line 92 | Line 89 | CONFIG_ARGS="--enable-table
89               --disable-pgsql
90               --disable-xml ${EXTRA_CONFIG_ARGS}"
91  
92 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
93 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
94 < %endif
92 > #case %gccver in
93 > #  4.*)
94 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
95 > #  ;;
96 > #esac
97  
98   case $(uname)-$(uname -p) in
99    Linux-x86_64)
100 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
100 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
101    Linux-i*86)
102      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
103    Darwin*)
# Line 124 | Line 123 | fi
123   export ROOTSYS=%i
124   make INSTALL="$cp" INSTALLDATA="$cp" install
125   mkdir -p $ROOTSYS/lib/python
126 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
126 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
127   #
128  
129   # SCRAM ToolBox toolfile
# Line 233 | Line 232 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
232   <info url="http://root.cern.ch/root/"></info>
233   <lib name=MathCore>
234   <lib name=MathMore>
235 + <lib name=GenVector>
236   <use name=ROOTCore>
237   <use name=gsl>
238   </Tool>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines