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.205 by elmer, Tue Aug 17 18:25:23 2010 UTC vs.
Revision 1.207 by elmer, Wed Sep 1 10:50:53 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.27.04
1 > ### RPM lcg root 5.22.00d
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.27-04-CINT-maxlongline-maxtypedef
11 < Patch2: root-5.22-00a-roofit-silence-static-printout
12 < Patch3: root-5.22-00d-linker-gnu-hash-style
13 < Patch4: root-5.22-00d-TBranchElement-dropped-data-member
14 < Patch5: root-5.27-04-fireworks8
9 > Patch0: root-5.18-00-libpng
10 > Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
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
33 > Patch24: root-5.22-00d-fireworks8
34 > Patch25: root-5.22-00d-fix-python-shebang
35 > Patch26: root-5.22-00d-RootsysOnMac
36 > Patch27: root-5.22-00d-TString-Clear
37  
38   %define cpu %(echo %cmsplatf | cut -d_ -f2)
39  
40 < Requires: gccxml gsl castor libjpg dcap pcre python
40 > Requires: gccxml gsl castor libjpg dcap pcre python fftw3
41 >
42   %if "%online" != "true"
43 < Requires: qt openssl libpng zlib libungif libtiff
43 > Requires: qt openssl libpng zlib libungif xrootd
44 > %else
45 > %define skiplibtiff true
46 > %endif
47 >
48 > %if "%cpu" == "amd64"
49 > %define skiplibtiff true
50 > %endif
51 >
52 > %if "%skiplibtiff" != "true"
53 > Requires: libtiff
54   %endif
55  
56   %prep
# Line 25 | Line 58 | Requires: qt openssl libpng zlib libungi
58   %patch0 -p1
59   %patch1 -p1
60   %patch2 -p1
61 < # patch3 is OS version dependent, see below
61 > %patch3 -p1
62   %patch4 -p1
63 +
64   %patch5 -p1
65 + %patch6 -p1
66 + %patch7 -p1
67 + %patch8 -p1
68 + %patch9 -p1
69 +
70 + # patch10 is compiler version dependent, see below
71 + %patch11 -p1
72 + %patch12 -p1
73 + # patch13 is compiler version dependent, see below
74 +
75 + # work around patch issue...
76 + rm graf3d/gl/src/gl2ps.c
77 + %patch14 -p1
78 + #work around patch issues in patch14(?)
79 + rm graf3d/eve/inc/TEveLegoOverlay.h.orig
80 + rm graf3d/eve/src/TEveLegoOverlay.cxx
81 + rm graf3d/gl/inc/gl2ps.h.orig
82 + rm graf3d/gl/src/gl2ps.c.orig
83 + %patch15 -p1
84 + %patch16 -p1
85 + %patch17 -p1
86 + %patch19 -p1
87 + %patch20 -p1
88 + %patch21 -p1
89 + %patch22 -p1
90 + %patch23 -p1
91 + %patch24 -p1
92 + %patch25 -p1
93 + %patch26 -p1
94 + %patch27 -p1
95 +
96 + case %gccver in
97 +  4.3.*)
98 + %patch13 -p1
99 +  ;;
100 +  4.4.*)
101 + %patch10 -p1
102 +  ;;
103 + esac
104  
105 < # The following patch can only be applied on SLC5 or later (extra linker
105 > # The following patch can only be applied on SLC5 or later (extra linker
106   # options only available with the SLC5 binutils)
107   case %cmsplatf in
108    slc5_* | slc5onl_* )
109 < %patch3 -p1
109 > %patch18 -p1
110    ;;
111   esac
112  
# Line 47 | Line 120 | export PYTHONV=$(echo $PYTHON_VERSION |
120   # Use system qt. Also skip xrootd and odbc for online case:
121  
122   EXTRA_CONFIG_ARGS="--with-f77=/usr
123 +             --disable-xrootd
124               --disable-odbc
125 <             --disable-qt --disable-qtgsi --disable-astiff"
125 >             --disable-qt --disable-qtgsi"
126   %else
127   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
128 +             --with-xrootd=$XROOTD_ROOT
129               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
130               --with-ssl-incdir=${OPENSSL_ROOT}/include
131               --with-ssl-libdir=${OPENSSL_ROOT}/lib
# Line 68 | Line 143 | CONFIG_ARGS="--enable-table
143               --enable-reflex  
144               --enable-cintex
145               --enable-minuit2
146 +             --enable-fftw3
147 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
148 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
149               --disable-ldap
150               --disable-krb5
151               --with-gsl-incdir=${GSL_ROOT}/include
# Line 80 | Line 158 | CONFIG_ARGS="--enable-table
158  
159   case $(uname)-$(uname -m) in
160    Linux-x86_64)
161 <    ./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 ;;
161 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
162    Linux-i*86)
163 <    ./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 ;;
163 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
164    Darwin*)
165      case %cmsplatf in
166      *_ia32_* )
# Line 126 | Line 204 | export ROOTSYS=%i
204   make INSTALL="$cp" INSTALLDATA="$cp" install
205   mkdir -p $ROOTSYS/lib/python
206   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
207 + #
208  
209   # SCRAM ToolBox toolfile
210   mkdir -p %i/etc/scram.d
# Line 165 | Line 244 | EOF_TOOLFILE
244  
245   # roothistmatrix toolfile
246   cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
247 <  <tool name="roothistmatrix" version="%v">
247 >  <tool name="roothistmatrix" version="%v">
248      <info url="http://root.cern.ch/root/"/>
249      <lib name="Hist"/>
250      <lib name="Matrix"/>
# Line 175 | Line 254 | EOF_TOOLFILE
254  
255   # rootgpad toolfile
256   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
257 <  <tool name="rootgpad" version="%v">
257 >  <tool name="rootgpad" version="%v">
258      <info url="http://root.cern.ch/root/"/>
259      <lib name="Gpad"/>
260      <lib name="Graf"/>
# Line 319 | Line 398 | EOF_TOOLFILE
398  
399   %post
400   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
322 –

Diff Legend

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