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.218 by elmer, Tue Nov 2 23:19:05 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.27.04
1 > ### RPM lcg root 5.27.06
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  
16   %define cpu %(echo %cmsplatf | cut -d_ -f2)
17  
18 < Requires: gccxml gsl castor libjpg dcap pcre python
18 > Requires: xrootd gccxml gsl castor libjpg dcap pcre python
19   %if "%online" != "true"
20   Requires: qt openssl libpng zlib libungif libtiff
21   %endif
# Line 40 | Line 40 | esac
40   %build
41  
42   mkdir -p %i
43 + export LIBJPG_ROOT
44   export ROOTSYS=%_builddir/root
45   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
46  
# Line 50 | Line 51 | EXTRA_CONFIG_ARGS="--with-f77=/usr
51               --disable-odbc
52               --disable-qt --disable-qtgsi --disable-astiff"
53   %else
54 + export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
55   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
56               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
57               --with-ssl-incdir=${OPENSSL_ROOT}/include
# Line 70 | Line 72 | CONFIG_ARGS="--enable-table
72               --enable-minuit2
73               --disable-ldap
74               --disable-krb5
75 +             --with-xrootd=${XROOTD_ROOT}
76               --with-gsl-incdir=${GSL_ROOT}/include
77               --with-gsl-libdir=${GSL_ROOT}/lib
78               --with-dcap-libdir=${DCAP_ROOT}/lib

Diff Legend

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