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.211 by eulisse, Thu Sep 30 13:09:49 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
# 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
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  
41   %define cpu %(echo %cmsplatf | cut -d_ -f2)
42  
43 < Requires: gccxml gsl castor libjpg dcap pcre python
43 > Requires: gccxml gsl libjpg pcre python fftw3
44  
45 < %if "%online" != "true"
46 < Requires: qt openssl libpng zlib libungif xrootd
40 < %else
41 < %define skiplibtiff true
45 > %if "%ismac" == "false"
46 > Requires: castor dcap
47   %endif
48  
49 < %if "%cpu" == "amd64"
50 < %define skiplibtiff true
49 > %if "%online-%ismac" == "false-true"
50 > Requires: openssl libpng zlib libungif libtiff gfortran-macosx
51   %endif
52  
53 < %if "%skiplibtiff" != "true"
54 < Requires: libtiff
53 > %if "%online-%ismac" == "false-false"
54 > Requires: qt openssl libpng zlib libungif xrootd libtiff
55   %endif
56  
57   %prep
# Line 74 | Line 79 | rm graf3d/gl/src/gl2ps.c
79   #work around patch issues in patch14(?)
80   rm graf3d/eve/inc/TEveLegoOverlay.h.orig
81   rm graf3d/eve/src/TEveLegoOverlay.cxx
77 rm graf3d/gl/inc/gl2ps.h.orig
78 rm graf3d/gl/src/gl2ps.c.orig
82   %patch15 -p1
83   %patch16 -p1
84   %patch17 -p1
# Line 84 | Line 87 | rm graf3d/gl/src/gl2ps.c.orig
87   %patch21 -p1
88   %patch22 -p1
89   %patch23 -p1
90 + %patch24 -p1
91 + %patch25 -p1
92 + %patch26 -p1
93 + %patch27 -p1
94 + %patch28 -p2
95 + %patch29 -p1
96  
97   case %gccver in
98    4.3.*)
# Line 105 | Line 114 | esac
114   %build
115  
116   mkdir -p %i
117 + export LIBJPG_ROOT
118   export ROOTSYS=%_builddir/root
119   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
120  
# Line 116 | Line 126 | EXTRA_CONFIG_ARGS="--with-f77=/usr
126               --disable-odbc
127               --disable-qt --disable-qtgsi"
128   %else
129 + export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
130   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
131               --with-xrootd=$XROOTD_ROOT
132               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
# Line 135 | Line 146 | CONFIG_ARGS="--enable-table
146               --enable-reflex  
147               --enable-cintex
148               --enable-minuit2
149 +             --enable-fftw3
150 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
151 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
152               --disable-ldap
153               --disable-krb5
154               --with-gsl-incdir=${GSL_ROOT}/include

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines