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.122 by andreasp, Thu Jul 24 18:39:57 2008 UTC vs.
Revision 1.132 by elmer, Thu Jan 15 00:59:45 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.20.00
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.20-00-libpng
8 < Patch1: root-5.20-00-CINT-maxlongline
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  
13   %define cpu %(echo %cmsplatf | cut -d_ -f2)
14   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 13 | Line 16 | Patch1: root-5.20-00-CINT-maxlongline
16   Requires: gccxml gsl castor libjpg dcap pcre python
17  
18   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
19 < Requires: qt openssl mysql libpng zlib libungif xrootd
19 > Requires: qt openssl mysql libpng zlib libungif
20   %else
21   %define skiplibtiff true
22   %endif
# Line 30 | Line 33 | Requires: libtiff
33   %setup -n root
34   %patch0 -p1
35   %patch1 -p1
36 + %patch2 -p1
37 + %patch3 -p1
38 + %patch4 -p1
39  
40   %build
41   mkdir -p %i
# Line 46 | Line 52 | EXTRA_CONFIG_ARGS="
52               --enable-qt"
53   %else
54   EXTRA_CONFIG_ARGS="
49             --with-xrootd=$XROOTD_ROOT
55               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
56               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
57               --with-ssl-incdir=${OPENSSL_ROOT}/include
58               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
59   %endif
60  
61 < CONFIG_ARGS="--enable-table
61 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
62 >             --enable-table
63               --disable-builtin-pcre
64               --disable-builtin-freetype
65               --disable-builtin-zlib
# Line 61 | Line 67 | CONFIG_ARGS="--enable-table
67               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
68               --enable-explicitlink
69               --enable-qtgsi
64             --enable-mathcore
70               --enable-mathmore
71               --enable-reflex  
72               --enable-cintex
# Line 76 | Line 81 | CONFIG_ARGS="--enable-table
81               --disable-pgsql
82               --disable-xml ${EXTRA_CONFIG_ARGS}"
83  
84 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
85 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
86 < %endif
84 > #case %gccver in
85 > #  4.*)
86 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
87 > #  ;;
88 > #esac
89  
90   case $(uname)-$(uname -p) in
91    Linux-x86_64)
# Line 217 | Line 224 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
224   <info url="http://root.cern.ch/root/"></info>
225   <lib name=MathCore>
226   <lib name=MathMore>
227 + <lib name=GenVector>
228   <use name=ROOTCore>
229   <use name=gsl>
230   </Tool>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines