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.164 by muzaffar, Thu Jun 18 16:09:28 2009 UTC vs.
Revision 1.169 by elmer, Tue Jul 7 15:06:48 2009 UTC

# Line 3 | Line 3
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 online %(case %cmsplatf in *onl_*_*) echo true ;; esac)
6 > %define closingbrace )
7 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo flase;; esac)
8  
9   Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
# Line 27 | Line 28 | Patch18: root-5.22-00a-fireworks3
28   Patch19: root-5.22-00a-TBranchElement
29   Patch20: root-5.22-00a-tmplt
30   Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
31 + Patch22: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
32  
33   %define cpu %(echo %cmsplatf | cut -d_ -f2)
34   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 65 | Line 67 | Requires: libtiff
67   %patch13 -p1
68   %patch14 -p0
69   %patch15 -p0
70 < %patch16 -p1
70 > # patch16 is compiler version dependent, see below
71   %patch17 -p1
72   %patch18 -p1
73   %patch19 -p0
# Line 73 | Line 75 | Requires: libtiff
75   %patch21 -p0
76   # work around patch issue...
77   rm graf3d/gl/src/gl2ps.c
78 + # patch22 is compiler version dependent, see below
79  
80   case %gccver in
81 <  4.4)
81 >  4.3.*)
82 > %patch22 -p1
83 >  ;;
84 >  4.4.*)
85   %patch16 -p1
86    ;;
87   esac
# Line 137 | Line 143 | case $(uname)-$(uname -p) in
143    Linux-i*86)
144      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
145    Darwin*)
140 –    rm ${LIBJPG_ROOT}/lib/libjpeg.dylib
141 –    rm ${LIBTIFF_ROOT}/lib/libtiff.dylib
142 –    rm ${LIBPNG_ROOT}/lib/libpng.dylib
146      ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
147    Linux-ppc64*)
148      ./configure linux $CONFIG_ARGS --disable-rfio;;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines