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.271 by eulisse, Thu Jun 23 14:09:11 2011 UTC vs.
Revision 1.314 by eulisse, Thu Dec 1 10:29:56 2011 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.30.00-rc2
1 > ### RPM lcg root 5.30.02
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3   ## INITENV SET ROOTSYS %i  
4   #Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
# Line 11 | Line 11 | Patch0: root-5.28-00d-externals
11   Patch1: root-5.28-00d-CINT-maxlongline-maxtypedef
12   Patch2: root-5.28-00d-roofit-silence-static-printout
13   Patch3: root-5.28-00d-linker-gnu-hash-style
14 < Patch4: root-5.28-00d-TBranchElement-dropped-data-member
15 < Patch5: root-5.28-00d-r37582-tmva
14 > #Patch4: root-5.28-00d-TBranchElement-dropped-data-member
15 > #Patch5: root-5.30-00-TSchemaRuleProcessor-nested-space
16 > #Patch5: root-5.28-00d-r37582-tmva
17   #Patch6: root-5.28-00d-TTreeCache-r37919
18   #Patch7: root-5.28-00d-r38248-r38259-r38264-r38265-r38267
19   #Patch8: root-5.28-00d-fireworks1
# Line 20 | Line 21 | Patch5: root-5.28-00d-r37582-tmva
21   #Patch10: root-5.28-00d-r39525
22   #Patch11: root-5.28-00d-r39657
23   #Patch12: root-5.28-00d-r39759
24 < Patch13: root-5.28-00d-fix-tsystem-load-macosx
24 > #Patch13: root-5.28-00d-fix-tsystem-load-macosx
25 > Patch14: root-5.30.02-detect-arch
26 > #Patch15: root-5.30.02-fix-isnan
27 > Patch16: root-5.30.02-fix-gcc46
28 > Patch17: root-5.30.02-r41453
29 > Patch18: root-5.30.02-r41523
30 > Patch19: root-5.30.02-fix-isnan-again
31 > Patch20: root-5.30.02-r41402
32  
33   %define cpu %(echo %cmsplatf | cut -d_ -f2)
34  
35 < Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3 xz
35 > Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3 xz xrootd
36  
37   %if "%ismac" != "true"
38   Requires: castor dcap
39   %endif
40  
41   %if "%online" != "true"
42 < Requires: openssl zlib xrootd
42 > Requires: openssl zlib
43   %endif
44  
45 < %if "%ismac" == "true"
45 > %define keep_archives true
46 > %if "%(case %cmsplatf in (osx*_*_gcc421) echo true ;; (*) echo false ;; esac)" == "true"
47   Requires: gfortran-macosx
48   %endif
49  
50 + %if "%(case %cmsplatf in (osx*) echo true ;; (*) echo false ;; esac)" == "true"
51 + Requires: freetype
52 + %endif
53 +
54   %prep
55   %setup -n root-%realversion
56   %patch0 -p1
57   %patch1 -p1
58   %patch2 -p1
59   # patch3 is OS version dependent, see below
60 < %patch4 -p1
61 < %patch5 -p1
60 > # patch4 -p1
61 > # patch5 -p2
62 > # patch5 -p1
63   # patch6 -p1
64   # patch7 -p1
65   # patch8 -p1
# Line 53 | Line 67 | Requires: gfortran-macosx
67   # patch10 -p1 TRY AGAIN!
68   # patch11 -p0
69   # patch12 -p2
70 < %patch13 -p1
70 > # patch13 -p1
71 > %patch14 -p0
72 > # patch15 -p1
73 > %patch16 -p1
74 > %patch17 -p1
75 > %patch18 -p2
76 > %patch19 -p1
77 > %patch20 -p2
78  
79   # The following patch can only be applied on SLC5 or later (extra linker
80   # options only available with the SLC5 binutils)
81   case %cmsplatf in
82 <  slc5_* | slc5onl_* )
82 >  slc[56]_* | slc5onl_* )
83   %patch3 -p1
84    ;;
85   esac
# Line 85 | Line 106 | EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT
106               --with-ssl-incdir=${OPENSSL_ROOT}/include
107               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
108   %endif
109 <
109 > LZMA=${XZ_ROOT}
110 > export LZMA
111   CONFIG_ARGS="--enable-table
112               --disable-builtin-pcre
113               --disable-builtin-freetype
# Line 97 | Line 119 | CONFIG_ARGS="--enable-table
119               --enable-reflex  
120               --enable-cintex
121               --enable-minuit2
122 <             --enable-lzma
101 <             --with-lzma-incdir=${XZ_ROOT}/include
102 <             --with-lzma-libdir=${XZ_ROOT}/lib
122 >             --disable-builtin-lzma
123               --enable-fftw3
124               --with-fftw3-incdir=${FFTW3_ROOT}/include
125               --with-fftw3-libdir=${FFTW3_ROOT}/lib
# Line 116 | Line 136 | CONFIG_ARGS="--enable-table
136               --disable-oracle ${EXTRA_CONFIG_ARGS}"
137  
138   case %cmsos in
139 <  slc*_amd64)
139 >  slc*)
140      ./configure linuxx8664gcc $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
121  slc*_ia32)
122    ./configure linux  $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
141    osx*)
142 <    case %cmsplatf in
143 <    *_ia32_* )
144 <      comparch=i386
127 <      macconfig=macosx
128 <      ;;
129 <    *_amd64_* )
130 <      comparch=x86_64
131 <      macconfig=macosx64
132 <      ;;
133 <    * )
134 <      comparch=ppc
135 <      macconfig=macosx
136 <      ;;
137 <    esac
138 <    export CC=`which gcc` CXX=`which g++`
139 <    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
142 >    comparch=x86_64
143 >    macconfig=macosx64
144 >    ./configure $arch $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
145    slc*_ppc64*)
146      ./configure linux $CONFIG_ARGS --disable-rfio;;
147   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines