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.196 by elmer, Tue Apr 13 13:12:24 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00d
1 > ### RPM lcg root 5.26.00b
2   ## INITENV +PATH PYTHONPATH %i/lib/python
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
# Line 6 | Line 6 | Source: ftp://root.cern.ch/%n/%{n}_v%{re
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
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
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
19  
20   %define cpu %(echo %cmsplatf | cut -d_ -f2)
21  
# Line 56 | Line 42 | Requires: libtiff
42   %patch2 -p1
43   %patch3 -p1
44   %patch4 -p1
59
45   %patch5 -p1
46   %patch6 -p1
47   %patch7 -p1
48   %patch8 -p1
49   %patch9 -p1
50  
66 # patch10 is compiler version dependent, see below
67 %patch11 -p1
68 %patch12 -p1
69 # patch13 is compiler version dependent, see below
70
71 # work around patch issue...
72 rm graf3d/gl/src/gl2ps.c
73 %patch14 -p1
74 #work around patch issues in patch14(?)
75 rm graf3d/eve/inc/TEveLegoOverlay.h.orig
76 rm graf3d/eve/src/TEveLegoOverlay.cxx
77 rm graf3d/gl/inc/gl2ps.h.orig
78 rm graf3d/gl/src/gl2ps.c.orig
79 %patch15 -p1
80 %patch16 -p1
81 %patch17 -p1
82 %patch19 -p1
83 %patch20 -p1
84 %patch21 -p1
85 %patch22 -p1
86 %patch23 -p1
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
51   %build
52  
53   mkdir -p %i
# Line 151 | Line 97 | case $(uname)-$(uname -m) in
97    Linux-i*86)
98      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
99    Darwin*)
100 <    case %cmsplatf in
155 <    *_ia32_* )
156 <      comparch=i386 ;;
157 <    *_amd64_* )
158 <      comparch=x86_64 ;;
159 <    * )
160 <      comparch=ppc ;;
161 <    esac
162 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
163 <    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
100 >    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
101    Linux-ppc64*)
102      ./configure linux $CONFIG_ARGS --disable-rfio;;
103   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines