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.128 by elmer, Tue Dec 16 01:51:29 2008 UTC vs.
Revision 1.143 by gowdy, Fri Feb 6 11:52:54 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
5 > #Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6 > Source: http://cern.ch/elmer/root_v5.22.00a.source.tar.gz
7  
8   Patch0:  root-5.18-00-libpng
9 < Patch1:  root-5.18-00a-CINT-maxlongline
10 < Patch2:  root_5.18-00-CINTFunctional
11 < Patch3:  root-5.18-00a-TBufferXML
12 < Patch4:  root-5.18-00a-Cintex
13 < Patch5:  root-5.18-00a-Cintex2
14 < Patch6:  root-5.18-00a-TBufferFile
15 < Patch7:  root-5.18-00a-cintexquickfix2
16 < Patch8:  root-5.18-00a-gendict-performance
17 < Patch9:  root-5.18-00a-TClass-classNameSize
18 < Patch10: root-5.18-00a-TFile-stlStreamerInfo
18 < Patch11: root-5.18-00-cintex_functional_mmap
19 < Patch12: root-5.18-00a-TMVA-fSilent
9 > Patch1:  root-5.21-04-CINT-maxlongline
10 > Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
11 > #Patch3:  root-5.22-00-gendict
12 > #Patch4:  root-5.22-00-RootSys
13 > #Patch5:  root-5.22-00-TClass-Clone
14 > #Patch6:  root-5.22-00-TBranchElement_initializeoffsets
15 > #Patch7:  root-5.22-00-TBranchElement-pcanal
16 > #Patch8:  root-5.22-00-TTreeCloner-CollectBranches-fix
17 > #Patch9:  root-5.22-00-path-length-fix1
18 > #Patch10:  root-5.22-00-path-length-fix2
19  
20   %define cpu %(echo %cmsplatf | cut -d_ -f2)
21   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 24 | Line 23 | Patch12: root-5.18-00a-TMVA-fSilent
23   Requires: gccxml gsl castor libjpg dcap pcre python
24  
25   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
26 < Requires: qt openssl mysql libpng zlib libungif xrootd
26 > Requires: qt openssl mysql libpng zlib libungif
27   %else
28   %define skiplibtiff true
29   %endif
# Line 41 | Line 40 | Requires: libtiff
40   %setup -n root
41   %patch0 -p1
42   %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
53 < %patch11 -p0
54 < %patch12 -p1
43 > %patch2 -p1
44 > #%patch3 -p1
45 > #%patch4 -p1
46 > #%patch5 -p1
47 > #%patch6 -p0
48 > #%patch7 -p1
49 > #%patch8 -p1
50 > #%patch9 -p1
51 > #%patch10 -p1
52  
53   %build
54   mkdir -p %i
# Line 68 | Line 65 | EXTRA_CONFIG_ARGS="
65               --enable-qt"
66   %else
67   EXTRA_CONFIG_ARGS="
71             --with-xrootd=$XROOTD_ROOT
68               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
69               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
70               --with-ssl-incdir=${OPENSSL_ROOT}/include
71               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
72   %endif
73  
74 < CONFIG_ARGS="--enable-table
74 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
75 >             --enable-table
76               --disable-builtin-pcre
77               --disable-builtin-freetype
78               --disable-builtin-zlib
# Line 83 | Line 80 | CONFIG_ARGS="--enable-table
80               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
81               --enable-explicitlink
82               --enable-qtgsi
86             --enable-mathcore
83               --enable-mathmore
84               --enable-reflex  
85               --enable-cintex
# Line 98 | Line 94 | CONFIG_ARGS="--enable-table
94               --disable-pgsql
95               --disable-xml ${EXTRA_CONFIG_ARGS}"
96  
97 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
98 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
99 < %endif
97 > #case %gccver in
98 > #  4.*)
99 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
100 > #  ;;
101 > #esac
102  
103   case $(uname)-$(uname -p) in
104    Linux-x86_64)
105 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
105 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
106    Linux-i*86)
107      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
108    Darwin*)
# Line 130 | Line 128 | fi
128   export ROOTSYS=%i
129   make INSTALL="$cp" INSTALLDATA="$cp" install
130   mkdir -p $ROOTSYS/lib/python
131 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
131 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
132   #
133  
134   # SCRAM ToolBox toolfile
# Line 239 | Line 237 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
237   <info url="http://root.cern.ch/root/"></info>
238   <lib name=MathCore>
239   <lib name=MathMore>
240 + <lib name=GenVector>
241   <use name=ROOTCore>
242   <use name=gsl>
243   </Tool>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines