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.205 by elmer, Tue Aug 17 18:25:23 2010 UTC vs.
Revision 1.225 by elmer, Sat Dec 18 07:13:14 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.27.04
1 > ### RPM lcg root 5.27.06b
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   %define closingbrace )
7   %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8  
9 < Patch0: root-5.18-00-libpng
9 > Patch0: root-5.27-06-externals
10   Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
11   Patch2: root-5.22-00a-roofit-silence-static-printout
12   Patch3: root-5.22-00d-linker-gnu-hash-style
13   Patch4: root-5.22-00d-TBranchElement-dropped-data-member
14 < Patch5: root-5.27-04-fireworks8
14 > Patch5: root-5.27-06-fireworks9
15 > Patch6: root-5.27-06b-gdb-backtrace
16 > Patch7: root-5.27-06-tmva-DecisionTreeNode
17 > Patch8: root-5.27-06b-r36567
18 > Patch9: root-5.27-06b-r36572
19 > Patch10: root-5.27-06b-r36707
20 > Patch11: root-5.27-06b-r36594
21 > Patch12: root-5.27-06b-tmva-MethodBase-initvar
22 > Patch13: root-5.27-06b-r37582-tmva
23 > Patch14: root-5.27-06b-r37405
24 > Patch15: root-5.27-06b-r37556
25 > Patch16: root-5.27-06-fireworks10
26  
27   %define cpu %(echo %cmsplatf | cut -d_ -f2)
28  
29 < Requires: gccxml gsl castor libjpg dcap pcre python
29 > Requires: xrootd gccxml gsl castor libjpg dcap pcre python fftw3
30   %if "%online" != "true"
31   Requires: qt openssl libpng zlib libungif libtiff
32   %endif
# Line 28 | Line 39 | Requires: qt openssl libpng zlib libungi
39   # patch3 is OS version dependent, see below
40   %patch4 -p1
41   %patch5 -p1
42 + %patch6 -p1
43 + %patch7 -p1
44 + %patch8 -p1
45 + %patch9 -p1
46 + %patch10 -p1
47 + %patch11 -p1
48 + %patch12 -p1
49 + %patch13 -p1
50 + %patch14 -p1
51 + %patch15 -p1
52 + %patch16 -p1
53  
54   # The following patch can only be applied on SLC5 or later (extra linker
55   # options only available with the SLC5 binutils)
# Line 40 | Line 62 | esac
62   %build
63  
64   mkdir -p %i
65 + export LIBJPG_ROOT
66   export ROOTSYS=%_builddir/root
67   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
68  
# Line 50 | Line 73 | EXTRA_CONFIG_ARGS="--with-f77=/usr
73               --disable-odbc
74               --disable-qt --disable-qtgsi --disable-astiff"
75   %else
76 + export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
77   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
78               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
79               --with-ssl-incdir=${OPENSSL_ROOT}/include
# Line 68 | Line 92 | CONFIG_ARGS="--enable-table
92               --enable-reflex  
93               --enable-cintex
94               --enable-minuit2
95 +             --enable-fftw3
96 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
97 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
98               --disable-ldap
99               --disable-krb5
100 +             --with-xrootd=${XROOTD_ROOT}
101               --with-gsl-incdir=${GSL_ROOT}/include
102               --with-gsl-libdir=${GSL_ROOT}/lib
103               --with-dcap-libdir=${DCAP_ROOT}/lib

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines