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.217 by elmer, Tue Nov 2 20:53:44 2010 UTC vs.
Revision 1.231 by elmer, Thu Jan 20 22:54:31 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: gccxml gsl castor libjpg dcap pcre python
29 < %if "%online" != "true"
30 < Requires: qt openssl libpng zlib libungif libtiff
28 > Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
29 >
30 > %if "%ismac" == "false"
31 > Requires: castor dcap
32 > %endif
33 >
34 > %if "%online-%ismac" == "false-true"
35 > Requires: openssl zlib gfortran-macosx
36 > %endif
37 >
38 > %if "%online-%ismac" == "false-false"
39 > Requires: openssl zlib qt xrootd
40   %endif
41  
42   %prep
# Line 28 | Line 47 | Requires: qt openssl libpng zlib libungi
47   # patch3 is OS version dependent, see below
48   %patch4 -p1
49   %patch5 -p1
50 + %patch6 -p1
51 + %patch7 -p1
52 + %patch8 -p1
53 + %patch9 -p1
54 + %patch10 -p1
55 + %patch11 -p1
56 + %patch12 -p1
57 + %patch13 -p1
58  
59   # The following patch can only be applied on SLC5 or later (extra linker
60   # options only available with the SLC5 binutils)
# Line 70 | Line 97 | CONFIG_ARGS="--enable-table
97               --enable-reflex  
98               --enable-cintex
99               --enable-minuit2
100 +             --enable-fftw3
101 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
102 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
103               --disable-ldap
104               --disable-krb5
105 +             --with-xrootd=${XROOTD_ROOT}
106               --with-gsl-incdir=${GSL_ROOT}/include
107               --with-gsl-libdir=${GSL_ROOT}/lib
108               --with-dcap-libdir=${DCAP_ROOT}/lib
# Line 88 | Line 119 | case $(uname)-$(uname -m) in
119    Darwin*)
120      case %cmsplatf in
121      *_ia32_* )
122 <      comparch=i386 ;;
122 >      comparch=i386
123 >      macconfig=macosx
124 >      ;;
125      *_amd64_* )
126 <      comparch=x86_64 ;;
126 >      comparch=x86_64
127 >      macconfig=macosx64
128 >      ;;
129      * )
130 <      comparch=ppc ;;
130 >      comparch=ppc
131 >      macconfig=macosx
132 >      ;;
133      esac
134      export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
135 <    ./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
135 >    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
136    Linux-ppc64*)
137      ./configure linux $CONFIG_ARGS --disable-rfio;;
138   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines