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.216 by elmer, Fri Oct 29 09:33:59 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 + %define ismac %(case %cmsplatf in osx*%closingbrace echo true;; *%closingbrace echo false;; esac)
9  
10 < Patch0: root-5.18-00-libpng
11 < Patch1: root-5.21-04-CINT-maxlongline
10 > Patch0: root-5.22-00d-externals
11 > Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
12   Patch2: root-5.22-00-TMVA-shut-the-hell-up-for-once
13   Patch3: root-5.22-00a-TMVA-shut-the-hell-up-again
14 < Patch4: root-5.22-00d-fireworks-graf3d-gui
14 > Patch4: root-5.22-00d-fireworks-graf3d-gui-ko
15   Patch5: root-5.22-00a-roofit-silence-static-printout
16   Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
17   Patch7: root-5.22-00a-th1
# Line 30 | Line 31 | Patch20: root-5.22-00d-cint-namespace
31   Patch21: root-5.22-00d-fireworks7
32   Patch22: root-5.22-00d-TMath-Vavilov
33   Patch23: root-5.22-00d-TBranchElement-dropped-data-member
34 + Patch24: root-5.22-00d-fireworks8-ko
35 + Patch25: root-5.22-00d-fix-python-shebang
36 + Patch26: root-5.22-00d-RootsysOnMac
37 + Patch27: root-5.22-00d-TString-Clear
38 + Patch28: root-5.22-00d-libgfortran-dylib-detection
39 + Patch29: root-5.22-00d-cint-dll-correct-install-name
40 + Patch30: root-5.22-00d-fireworks9
41  
42   %define cpu %(echo %cmsplatf | cut -d_ -f2)
43  
44 < Requires: gccxml gsl castor libjpg dcap pcre python
44 > Requires: gccxml gsl libjpg pcre python fftw3
45  
46 < %if "%online" != "true"
47 < Requires: qt openssl libpng zlib libungif xrootd
40 < %else
41 < %define skiplibtiff true
46 > %if "%ismac" == "false"
47 > Requires: castor dcap
48   %endif
49  
50 < %if "%cpu" == "amd64"
51 < %define skiplibtiff true
50 > %if "%online-%ismac" == "false-true"
51 > Requires: openssl libpng zlib libungif libtiff gfortran-macosx
52   %endif
53  
54 < %if "%skiplibtiff" != "true"
55 < Requires: libtiff
54 > %if "%online-%ismac" == "false-false"
55 > Requires: qt openssl libpng zlib libungif xrootd libtiff
56   %endif
57  
58   %prep
# Line 64 | Line 70 | Requires: libtiff
70   %patch9 -p1
71  
72   # patch10 is compiler version dependent, see below
73 + # Work around patch issue.
74 + #rm graf3d/gl/src/gl2ps.c
75   %patch11 -p1
76   %patch12 -p1
77   # patch13 is compiler version dependent, see below
78  
79   # work around patch issue...
80 < rm graf3d/gl/src/gl2ps.c
80 > #rm graf3d/gl/src/gl2ps.c
81   %patch14 -p1
82   #work around patch issues in patch14(?)
83 < rm graf3d/eve/inc/TEveLegoOverlay.h.orig
84 < rm graf3d/eve/src/TEveLegoOverlay.cxx
77 < rm graf3d/gl/inc/gl2ps.h.orig
78 < rm graf3d/gl/src/gl2ps.c.orig
83 > #rm graf3d/eve/inc/TEveLegoOverlay.h.orig
84 > #rm graf3d/eve/src/TEveLegoOverlay.cxx
85   %patch15 -p1
86   %patch16 -p1
87   %patch17 -p1
# Line 84 | Line 90 | rm graf3d/gl/src/gl2ps.c.orig
90   %patch21 -p1
91   %patch22 -p1
92   %patch23 -p1
93 + %patch24 -p1
94 + %patch25 -p1
95 + %patch26 -p1
96 + %patch27 -p1
97 + %patch28 -p2
98 + %patch29 -p1
99 + %patch30 -p1
100  
101   case %gccver in
102    4.3.*)
# Line 105 | Line 118 | esac
118   %build
119  
120   mkdir -p %i
121 + export LIBJPG_ROOT
122   export ROOTSYS=%_builddir/root
123   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
124  
# Line 116 | Line 130 | EXTRA_CONFIG_ARGS="--with-f77=/usr
130               --disable-odbc
131               --disable-qt --disable-qtgsi"
132   %else
133 + export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
134   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
135               --with-xrootd=$XROOTD_ROOT
136               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
# Line 135 | Line 150 | CONFIG_ARGS="--enable-table
150               --enable-reflex  
151               --enable-cintex
152               --enable-minuit2
153 +             --enable-fftw3
154 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
155 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
156               --disable-ldap
157               --disable-krb5
158               --with-gsl-incdir=${GSL_ROOT}/include

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines