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.218 by elmer, Tue Nov 2 23:19:05 2010 UTC vs.
Revision 1.235 by fwyzard, Fri Jan 21 12:31:46 2011 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.27.06
1 > ### RPM lcg root 5.27.06b
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
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 e
9 + cho false;; esac)
10  
11   Patch0: root-5.27-06-externals
12   Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
# Line 12 | Line 14 | Patch2: root-5.22-00a-roofit-silence-sta
14   Patch3: root-5.22-00d-linker-gnu-hash-style
15   Patch4: root-5.22-00d-TBranchElement-dropped-data-member
16   Patch5: root-5.27-06-fireworks9
17 + Patch6: root-5.27-06b-gdb-backtrace
18 + Patch7: root-5.27-06-tmva-DecisionTreeNode
19 + Patch8: root-5.27-06b-r36567
20 + Patch9: root-5.27-06b-r36572
21 + Patch10: root-5.27-06b-r36707
22 + Patch11: root-5.27-06b-r36594
23 + Patch12: root-5.27-06b-tmva-MethodBase-initvar
24 + Patch13: root-5.27-06b-tmva_Event_dynamic_hack
25  
26   %define cpu %(echo %cmsplatf | cut -d_ -f2)
27  
28 < Requires: xrootd gccxml gsl castor libjpg dcap pcre python
28 > Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
29 >
30 > %if "%ismac" != "true"
31 > Requires: castor dcap
32 > %endif
33 >
34 > %if "%online" != "true"
35 > Requires: openssl zlib xrootd
36 > %endif
37 >
38 > %if "%ismac" == "true"
39 > Requires: gfortran-macosx
40 > %endif
41 >
42   %if "%online" != "true"
43 < Requires: qt openssl libpng zlib libungif libtiff
43 > %if "%ismac" != "true"
44 > Requires: qt
45 > %endif
46   %endif
47  
48   %prep
# Line 28 | Line 53 | Requires: qt openssl libpng zlib libungi
53   # patch3 is OS version dependent, see below
54   %patch4 -p1
55   %patch5 -p1
56 + %patch6 -p1
57 + %patch7 -p1
58 + %patch8 -p1
59 + %patch9 -p1
60 + %patch10 -p1
61 + %patch11 -p1
62 + %patch12 -p1
63 + %patch13 -p1
64  
65   # The following patch can only be applied on SLC5 or later (extra linker
66   # options only available with the SLC5 binutils)
# Line 37 | Line 70 | case %cmsplatf in
70    ;;
71   esac
72  
73 + # Delete these (irrelevant) files as the fits appear to confuse rpm on OSX
74 + # (It tries to run install_name_tool on them.)
75 + rm -fR tutorials/fitsio
76 +
77   %build
78  
79   mkdir -p %i
# Line 70 | Line 107 | CONFIG_ARGS="--enable-table
107               --enable-reflex  
108               --enable-cintex
109               --enable-minuit2
110 +             --enable-fftw3
111 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
112 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
113               --disable-ldap
114               --disable-krb5
115               --with-xrootd=${XROOTD_ROOT}
# Line 79 | Line 119 | CONFIG_ARGS="--enable-table
119               --with-dcap-incdir=${DCAP_ROOT}/include
120               --disable-pgsql
121               --disable-mysql
122 +             --disable-oracle
123               --disable-xml ${EXTRA_CONFIG_ARGS}"
124  
125   case $(uname)-$(uname -m) in
# Line 89 | Line 130 | case $(uname)-$(uname -m) in
130    Darwin*)
131      case %cmsplatf in
132      *_ia32_* )
133 <      comparch=i386 ;;
133 >      comparch=i386
134 >      macconfig=macosx
135 >      ;;
136      *_amd64_* )
137 <      comparch=x86_64 ;;
137 >      comparch=x86_64
138 >      macconfig=macosx64
139 >      ;;
140      * )
141 <      comparch=ppc ;;
141 >      comparch=ppc
142 >      macconfig=macosx
143 >      ;;
144      esac
145      export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
146 <    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
146 >    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
147    Linux-ppc64*)
148      ./configure linux $CONFIG_ARGS --disable-rfio;;
149   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines