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.196 by elmer, Tue Apr 13 13:12:24 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.26.00b
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-TMath-Vavilov
16 < Patch7:  root-5.22-00d-TBranchElement-dropped-data-member
17 < Patch8:  root-5.26-00b-genreflex-version-wildcard
18 < Patch9:  root-5.26.00b-fireworks1
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
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 > 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
26 < %else
27 < %define skiplibtiff true
28 < %endif
29 <
30 < %if "%cpu" == "amd64"
31 < %define skiplibtiff true
32 < %endif
33 <
34 < %if "%skiplibtiff" != "true"
35 < Requires: libtiff
44 > Requires: qt openssl libpng zlib libungif xrootd libtiff
45   %endif
46  
47   %prep
# Line 42 | Line 51 | Requires: libtiff
51   %patch2 -p1
52   %patch3 -p1
53   %patch4 -p1
54 +
55   %patch5 -p1
56   %patch6 -p1
57   %patch7 -p1
58   %patch8 -p1
59   %patch9 -p1
60  
61 + # patch10 is compiler version dependent, see below
62 + %patch11 -p1
63 + %patch12 -p1
64 + # patch13 is compiler version dependent, see below
65 +
66 + # work around patch issue...
67 + rm graf3d/gl/src/gl2ps.c
68 + %patch14 -p1
69 + #work around patch issues in patch14(?)
70 + rm graf3d/eve/inc/TEveLegoOverlay.h.orig
71 + rm graf3d/eve/src/TEveLegoOverlay.cxx
72 + rm graf3d/gl/inc/gl2ps.h.orig
73 + rm graf3d/gl/src/gl2ps.c.orig
74 + %patch15 -p1
75 + %patch16 -p1
76 + %patch17 -p1
77 + %patch19 -p1
78 + %patch20 -p1
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.*)
90 + %patch13 -p1
91 +  ;;
92 +  4.4.*)
93 + %patch10 -p1
94 +  ;;
95 + esac
96 +
97 + # The following patch can only be applied on SLC5 or later (extra linker
98 + # options only available with the SLC5 binutils)
99 + case %cmsplatf in
100 +  slc5_* | slc5onl_* )
101 + %patch18 -p1
102 +  ;;
103 + esac
104 +
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 62 | 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 81 | 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
# Line 97 | Line 156 | case $(uname)-$(uname -m) in
156    Linux-i*86)
157      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
158    Darwin*)
159 <    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
159 >    case %cmsplatf in
160 >    *_ia32_* )
161 >      comparch=i386 ;;
162 >    *_amd64_* )
163 >      comparch=x86_64 ;;
164 >    * )
165 >      comparch=ppc ;;
166 >    esac
167 >    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
168 >    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
169    Linux-ppc64*)
170      ./configure linux $CONFIG_ARGS --disable-rfio;;
171   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines