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.197 by elmer, Tue May 11 23:28:21 2010 UTC vs.
Revision 1.207 by elmer, Wed Sep 1 10:50:53 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.27.02
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.22-00-TMVA-shut-the-hell-up-for-once
11 < Patch2:  root-5.22-00a-roofit-silence-static-printout
12 < Patch3:  root-5.22-00d-linker-gnu-hash-style
13 < Patch4:  root-5.26-00a-CINT-maxlongline
14 < Patch5:  root-5.26-00a-silence-TMVA
15 < Patch6:  root-5.22-00d-TBranchElement-dropped-data-member
9 > Patch0: root-5.18-00-libpng
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
14 > Patch5: root-5.22-00a-roofit-silence-static-printout
15 > Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
16 > Patch7: root-5.22-00a-th1
17 > Patch8: root-5.22-00d-makelib-ldl
18 > Patch9: root-5.22-00a-fireworks1
19 > Patch10: root-5.22-00a-gcc44
20 > Patch11: root-5.22-00a-fireworks2
21 > Patch12: root-5.22-00a-fireworks3
22 > Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
23 > Patch14: root-5.22-00a-fireworks4
24 > Patch15: root-5.22-00d-fireworks5
25 > Patch16: root-5.22-00d-genreflex_python26_popen3
26 > Patch17: root-5.22-00d-fireworks6
27 > Patch18: root-5.22-00d-linker-gnu-hash-style
28 > Patch19: root-5.22-00d-TFile-version3-Init
29 > 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  
38   %define cpu %(echo %cmsplatf | cut -d_ -f2)
39  
40 < Requires: gccxml gsl castor libjpg dcap pcre python
40 > Requires: gccxml gsl castor libjpg dcap pcre python fftw3
41  
42   %if "%online" != "true"
43   Requires: qt openssl libpng zlib libungif xrootd
# Line 39 | Line 60 | Requires: libtiff
60   %patch2 -p1
61   %patch3 -p1
62   %patch4 -p1
63 +
64   %patch5 -p1
65   %patch6 -p1
66 + %patch7 -p1
67 + %patch8 -p1
68 + %patch9 -p1
69 +
70 + # patch10 is compiler version dependent, see below
71 + %patch11 -p1
72 + %patch12 -p1
73 + # patch13 is compiler version dependent, see below
74 +
75 + # work around patch issue...
76 + rm graf3d/gl/src/gl2ps.c
77 + %patch14 -p1
78 + #work around patch issues in patch14(?)
79 + rm graf3d/eve/inc/TEveLegoOverlay.h.orig
80 + rm graf3d/eve/src/TEveLegoOverlay.cxx
81 + rm graf3d/gl/inc/gl2ps.h.orig
82 + rm graf3d/gl/src/gl2ps.c.orig
83 + %patch15 -p1
84 + %patch16 -p1
85 + %patch17 -p1
86 + %patch19 -p1
87 + %patch20 -p1
88 + %patch21 -p1
89 + %patch22 -p1
90 + %patch23 -p1
91 + %patch24 -p1
92 + %patch25 -p1
93 + %patch26 -p1
94 + %patch27 -p1
95 +
96 + case %gccver in
97 +  4.3.*)
98 + %patch13 -p1
99 +  ;;
100 +  4.4.*)
101 + %patch10 -p1
102 +  ;;
103 + esac
104 +
105 + # The following patch can only be applied on SLC5 or later (extra linker
106 + # options only available with the SLC5 binutils)
107 + case %cmsplatf in
108 +  slc5_* | slc5onl_* )
109 + %patch18 -p1
110 +  ;;
111 + esac
112  
113   %build
114  
# Line 75 | Line 143 | CONFIG_ARGS="--enable-table
143               --enable-reflex  
144               --enable-cintex
145               --enable-minuit2
146 +             --enable-fftw3
147 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
148 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
149               --disable-ldap
150               --disable-krb5
151               --with-gsl-incdir=${GSL_ROOT}/include
# Line 91 | Line 162 | case $(uname)-$(uname -m) in
162    Linux-i*86)
163      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
164    Darwin*)
165 <    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
165 >    case %cmsplatf in
166 >    *_ia32_* )
167 >      comparch=i386 ;;
168 >    *_amd64_* )
169 >      comparch=x86_64 ;;
170 >    * )
171 >      comparch=ppc ;;
172 >    esac
173 >    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
174 >    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
175    Linux-ppc64*)
176      ./configure linux $CONFIG_ARGS --disable-rfio;;
177   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines