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.195 by elmer, Thu Apr 8 15:28:15 2010 UTC vs.
Revision 1.209 by muzaffar, Thu Sep 23 08:21:36 2010 UTC

# Line 1 | Line 1
1   ### RPM lcg root 5.22.00d
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3 < ## INITENV SET ROOTSYS %i
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   %define closingbrace )
7   %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8  
9 < Patch0: root-5.18-00-libpng
10 < Patch1: root-5.21-04-CINT-maxlongline
9 > Patch0: root-5.22-00d-externals
10 > Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
11   Patch2: root-5.22-00-TMVA-shut-the-hell-up-for-once
12   Patch3: root-5.22-00a-TMVA-shut-the-hell-up-again
13   Patch4: root-5.22-00d-fireworks-graf3d-gui
# Line 30 | Line 30 | Patch20: root-5.22-00d-cint-namespace
30   Patch21: root-5.22-00d-fireworks7
31   Patch22: root-5.22-00d-TMath-Vavilov
32   Patch23: root-5.22-00d-TBranchElement-dropped-data-member
33 + Patch24: root-5.22-00d-fireworks8
34 + Patch25: root-5.22-00d-fix-python-shebang
35 + Patch26: root-5.22-00d-RootsysOnMac
36 + Patch27: root-5.22-00d-TString-Clear
37 + Patch28: root-5.22-00d-libgfortran-dylib-detection
38  
39   %define cpu %(echo %cmsplatf | cut -d_ -f2)
40  
41 < Requires: gccxml gsl castor libjpg dcap pcre python
41 > Requires: gccxml gsl castor libjpg dcap pcre python fftw3
42  
43   %if "%online" != "true"
44 < Requires: qt openssl libpng zlib libungif xrootd
40 < %else
41 < %define skiplibtiff true
42 < %endif
43 <
44 < %if "%cpu" == "amd64"
45 < %define skiplibtiff true
46 < %endif
47 <
48 < %if "%skiplibtiff" != "true"
49 < Requires: libtiff
44 > Requires: qt openssl libpng zlib libungif xrootd libtiff
45   %endif
46  
47   %prep
# Line 84 | Line 79 | rm graf3d/gl/src/gl2ps.c.orig
79   %patch21 -p1
80   %patch22 -p1
81   %patch23 -p1
82 + %patch24 -p1
83 + %patch25 -p1
84 + %patch26 -p1
85 + %patch27 -p1
86 + %patch28 -p2
87  
88   case %gccver in
89    4.3.*)
# Line 105 | Line 105 | esac
105   %build
106  
107   mkdir -p %i
108 + export LIBJPG_ROOT
109   export ROOTSYS=%_builddir/root
110   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
111  
# Line 116 | Line 117 | EXTRA_CONFIG_ARGS="--with-f77=/usr
117               --disable-odbc
118               --disable-qt --disable-qtgsi"
119   %else
120 + export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
121   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
122               --with-xrootd=$XROOTD_ROOT
123               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
# Line 135 | Line 137 | CONFIG_ARGS="--enable-table
137               --enable-reflex  
138               --enable-cintex
139               --enable-minuit2
140 +             --enable-fftw3
141 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
142 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
143               --disable-ldap
144               --disable-krb5
145               --with-gsl-incdir=${GSL_ROOT}/include

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines