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.139 by gowdy, Tue Feb 3 14:07:32 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
17 < Patch10: root-5.18-00a-TFile-stlStreamerInfo
18 < Patch11: root-5.18-00-cintex_functional_mmap
19 < Patch12: root-5.18-00a-TMVA-fSilent
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 > Patch9:  root-5.22-00-path-length-fix1
17 > Patch10:  root-5.22-00-path-length-fix2
18  
19   %define cpu %(echo %cmsplatf | cut -d_ -f2)
20   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 24 | Line 22 | Patch12: root-5.18-00a-TMVA-fSilent
22   Requires: gccxml gsl castor libjpg dcap pcre python
23  
24   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
25 < Requires: qt openssl mysql libpng zlib libungif xrootd
25 > Requires: qt openssl mysql libpng zlib libungif
26   %else
27   %define skiplibtiff true
28   %endif
# Line 41 | Line 39 | Requires: libtiff
39   %setup -n root
40   %patch0 -p1
41   %patch1 -p1
42 < %patch2 -p0
42 > %patch2 -p1
43   %patch3 -p1
44 < %patch4 -p0
45 < %patch5 -p0
44 > %patch4 -p1
45 > %patch5 -p1
46   %patch6 -p0
47 < %patch7 -p0
47 > %patch7 -p1
48   %patch8 -p1
49 < %patch9 -p0
50 < %patch10 -p0
53 < %patch11 -p0
54 < %patch12 -p1
49 > %patch9 -p1
50 > %patch10 -p1
51  
52   %build
53   mkdir -p %i
# Line 68 | Line 64 | EXTRA_CONFIG_ARGS="
64               --enable-qt"
65   %else
66   EXTRA_CONFIG_ARGS="
71 –             --with-xrootd=$XROOTD_ROOT
67               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
68               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
69               --with-ssl-incdir=${OPENSSL_ROOT}/include
70               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
71   %endif
72  
73 < CONFIG_ARGS="--enable-table
73 > CONFIG_ARGS="--with-f77=${GCC_ROOT}
74 >             --enable-table
75               --disable-builtin-pcre
76               --disable-builtin-freetype
77               --disable-builtin-zlib
# Line 83 | Line 79 | CONFIG_ARGS="--enable-table
79               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
80               --enable-explicitlink
81               --enable-qtgsi
86 –             --enable-mathcore
82               --enable-mathmore
83               --enable-reflex  
84               --enable-cintex
85               --enable-minuit2
86               --enable-roofit
87               --disable-ldap
93 –             --disable-krb5
88               --with-gsl-incdir=${GSL_ROOT}/include
89               --with-gsl-libdir=${GSL_ROOT}/lib
90               --with-dcap-libdir=${DCAP_ROOT}/lib
# Line 98 | Line 92 | CONFIG_ARGS="--enable-table
92               --disable-pgsql
93               --disable-xml ${EXTRA_CONFIG_ARGS}"
94  
95 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
96 <  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
97 < %endif
95 > #case %gccver in
96 > #  4.*)
97 > #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
98 > #  ;;
99 > #esac
100  
101   case $(uname)-$(uname -p) in
102    Linux-x86_64)
103 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
103 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
104    Linux-i*86)
105      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
106    Darwin*)
# Line 130 | Line 126 | fi
126   export ROOTSYS=%i
127   make INSTALL="$cp" INSTALLDATA="$cp" install
128   mkdir -p $ROOTSYS/lib/python
129 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
129 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
130   #
131  
132   # SCRAM ToolBox toolfile
# Line 239 | Line 235 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
235   <info url="http://root.cern.ch/root/"></info>
236   <lib name=MathCore>
237   <lib name=MathMore>
238 + <lib name=GenVector>
239   <use name=ROOTCore>
240   <use name=gsl>
241   </Tool>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines