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.193 by elmer, Mon Mar 29 11:21:08 2010 UTC vs.
Revision 1.225 by elmer, Sat Dec 18 07:13:14 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00d
1 > ### RPM lcg root 5.27.06b
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3 < ## INITENV SET ROOTSYS %i
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  
9 < Patch0:  root-5.18-00-libpng
10 < Patch1:  root-5.21-04-CINT-maxlongline
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 < # patch 8 was dropped
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
9 > Patch0: root-5.27-06-externals
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-06-fireworks9
15 > Patch6: root-5.27-06b-gdb-backtrace
16 > Patch7: root-5.27-06-tmva-DecisionTreeNode
17 > Patch8: root-5.27-06b-r36567
18 > Patch9: root-5.27-06b-r36572
19 > Patch10: root-5.27-06b-r36707
20 > Patch11: root-5.27-06b-r36594
21 > Patch12: root-5.27-06b-tmva-MethodBase-initvar
22 > Patch13: root-5.27-06b-r37582-tmva
23 > Patch14: root-5.27-06b-r37405
24 > Patch15: root-5.27-06b-r37556
25 > Patch16: root-5.27-06-fireworks10
26  
27   %define cpu %(echo %cmsplatf | cut -d_ -f2)
28  
29 < Requires: gccxml gsl castor libjpg dcap pcre python
35 <
29 > Requires: xrootd gccxml gsl castor libjpg dcap pcre python fftw3
30   %if "%online" != "true"
31 < Requires: qt openssl libpng zlib libungif xrootd
38 < %else
39 < %define skiplibtiff true
40 < %endif
41 <
42 < %if "%cpu" == "amd64"
43 < %define skiplibtiff true
44 < %endif
45 <
46 < %if "%skiplibtiff" != "true"
47 < Requires: libtiff
31 > Requires: qt openssl libpng zlib libungif libtiff
32   %endif
33  
34   %prep
# Line 52 | Line 36 | Requires: libtiff
36   %patch0 -p1
37   %patch1 -p1
38   %patch2 -p1
39 < %patch3 -p1
39 > # patch3 is OS version dependent, see below
40   %patch4 -p1
57
41   %patch5 -p1
42   %patch6 -p1
43   %patch7 -p1
44 < # patch 8 was dropped
44 > %patch8 -p1
45   %patch9 -p1
46 <
64 < # patch10 is compiler version dependent, see below
46 > %patch10 -p1
47   %patch11 -p1
48   %patch12 -p1
49 < # patch13 is compiler version dependent, see below
68 <
69 < # work around patch issue...
70 < rm graf3d/gl/src/gl2ps.c
49 > %patch13 -p1
50   %patch14 -p1
72 #work around patch issues in patch14(?)
73 rm graf3d/eve/inc/TEveLegoOverlay.h.orig
74 rm graf3d/eve/src/TEveLegoOverlay.cxx
75 rm graf3d/gl/inc/gl2ps.h.orig
76 rm graf3d/gl/src/gl2ps.c.orig
51   %patch15 -p1
52   %patch16 -p1
79 %patch17 -p1
80 %patch19 -p1
81 %patch20 -p1
82 %patch21 -p1
83
84 case %gccver in
85  4.3.*)
86 %patch13 -p1
87  ;;
88  4.4.*)
89 %patch10 -p1
90  ;;
91 esac
53  
54 < # The following patch can only be applied on SLC5 or later (extra linker
54 > # The following patch can only be applied on SLC5 or later (extra linker
55   # options only available with the SLC5 binutils)
56   case %cmsplatf in
57    slc5_* | slc5onl_* )
58 < %patch18 -p1
58 > %patch3 -p1
59    ;;
60   esac
61  
62   %build
63  
64   mkdir -p %i
65 + export LIBJPG_ROOT
66   export ROOTSYS=%_builddir/root
67   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
68  
# Line 108 | Line 70 | export PYTHONV=$(echo $PYTHON_VERSION |
70   # Use system qt. Also skip xrootd and odbc for online case:
71  
72   EXTRA_CONFIG_ARGS="--with-f77=/usr
111             --disable-xrootd
73               --disable-odbc
74 <             --disable-qt --disable-qtgsi"
74 >             --disable-qt --disable-qtgsi --disable-astiff"
75   %else
76 + export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
77   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
116             --with-xrootd=$XROOTD_ROOT
78               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
79               --with-ssl-incdir=${OPENSSL_ROOT}/include
80               --with-ssl-libdir=${OPENSSL_ROOT}/lib
# Line 131 | Line 92 | CONFIG_ARGS="--enable-table
92               --enable-reflex  
93               --enable-cintex
94               --enable-minuit2
95 +             --enable-fftw3
96 +             --with-fftw3-incdir=${FFTW3_ROOT}/include
97 +             --with-fftw3-libdir=${FFTW3_ROOT}/lib
98               --disable-ldap
99               --disable-krb5
100 +             --with-xrootd=${XROOTD_ROOT}
101               --with-gsl-incdir=${GSL_ROOT}/include
102               --with-gsl-libdir=${GSL_ROOT}/lib
103               --with-dcap-libdir=${DCAP_ROOT}/lib
# Line 143 | Line 108 | CONFIG_ARGS="--enable-table
108  
109   case $(uname)-$(uname -m) in
110    Linux-x86_64)
111 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
111 >    ./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 ;;
112    Linux-i*86)
113 <    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
113 >    ./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 ;;
114    Darwin*)
115      case %cmsplatf in
116      *_ia32_* )
# Line 189 | Line 154 | export ROOTSYS=%i
154   make INSTALL="$cp" INSTALLDATA="$cp" install
155   mkdir -p $ROOTSYS/lib/python
156   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
192 #
157  
158   # SCRAM ToolBox toolfile
159   mkdir -p %i/etc/scram.d
# Line 229 | Line 193 | EOF_TOOLFILE
193  
194   # roothistmatrix toolfile
195   cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
196 <  <tool name="roothistmatrix" version="%v">
196 >  <tool name="roothistmatrix" version="%v">
197      <info url="http://root.cern.ch/root/"/>
198      <lib name="Hist"/>
199      <lib name="Matrix"/>
# Line 239 | Line 203 | EOF_TOOLFILE
203  
204   # rootgpad toolfile
205   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
206 <  <tool name="rootgpad" version="%v">
206 >  <tool name="rootgpad" version="%v">
207      <info url="http://root.cern.ch/root/"/>
208      <lib name="Gpad"/>
209      <lib name="Graf"/>
# Line 383 | Line 347 | EOF_TOOLFILE
347  
348   %post
349   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
350 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines