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.195 by elmer, Thu Apr 8 15:28:15 2010 UTC vs.
Revision 1.205 by elmer, Tue Aug 17 18:25:23 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00d
1 > ### RPM lcg root 5.27.04
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 < 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
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
15  
16   %define cpu %(echo %cmsplatf | cut -d_ -f2)
17  
18   Requires: gccxml gsl castor libjpg dcap pcre python
37
19   %if "%online" != "true"
20 < Requires: qt openssl libpng zlib libungif xrootd
40 < %else
41 < %define skiplibtiff true
42 < %endif
43 <
44 < %if "%cpu" == "amd64"
45 < %define skiplibtiff true
46 < %endif
47 <
48 < %if "%skiplibtiff" != "true"
49 < Requires: libtiff
20 > Requires: qt openssl libpng zlib libungif libtiff
21   %endif
22  
23   %prep
# Line 54 | Line 25 | Requires: libtiff
25   %patch0 -p1
26   %patch1 -p1
27   %patch2 -p1
28 < %patch3 -p1
28 > # patch3 is OS version dependent, see below
29   %patch4 -p1
59
30   %patch5 -p1
61 %patch6 -p1
62 %patch7 -p1
63 %patch8 -p1
64 %patch9 -p1
65
66 # patch10 is compiler version dependent, see below
67 %patch11 -p1
68 %patch12 -p1
69 # patch13 is compiler version dependent, see below
70
71 # work around patch issue...
72 rm graf3d/gl/src/gl2ps.c
73 %patch14 -p1
74 #work around patch issues in patch14(?)
75 rm graf3d/eve/inc/TEveLegoOverlay.h.orig
76 rm graf3d/eve/src/TEveLegoOverlay.cxx
77 rm graf3d/gl/inc/gl2ps.h.orig
78 rm graf3d/gl/src/gl2ps.c.orig
79 %patch15 -p1
80 %patch16 -p1
81 %patch17 -p1
82 %patch19 -p1
83 %patch20 -p1
84 %patch21 -p1
85 %patch22 -p1
86 %patch23 -p1
87
88 case %gccver in
89  4.3.*)
90 %patch13 -p1
91  ;;
92  4.4.*)
93 %patch10 -p1
94  ;;
95 esac
31  
32 < # The following patch can only be applied on SLC5 or later (extra linker
32 > # The following patch can only be applied on SLC5 or later (extra linker
33   # options only available with the SLC5 binutils)
34   case %cmsplatf in
35    slc5_* | slc5onl_* )
36 < %patch18 -p1
36 > %patch3 -p1
37    ;;
38   esac
39  
# Line 112 | Line 47 | export PYTHONV=$(echo $PYTHON_VERSION |
47   # Use system qt. Also skip xrootd and odbc for online case:
48  
49   EXTRA_CONFIG_ARGS="--with-f77=/usr
115             --disable-xrootd
50               --disable-odbc
51 <             --disable-qt --disable-qtgsi"
51 >             --disable-qt --disable-qtgsi --disable-astiff"
52   %else
53   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
120             --with-xrootd=$XROOTD_ROOT
54               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
55               --with-ssl-incdir=${OPENSSL_ROOT}/include
56               --with-ssl-libdir=${OPENSSL_ROOT}/lib
# Line 147 | Line 80 | CONFIG_ARGS="--enable-table
80  
81   case $(uname)-$(uname -m) in
82    Linux-x86_64)
83 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
83 >    ./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 ;;
84    Linux-i*86)
85 <    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
85 >    ./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 ;;
86    Darwin*)
87      case %cmsplatf in
88      *_ia32_* )
# Line 193 | Line 126 | export ROOTSYS=%i
126   make INSTALL="$cp" INSTALLDATA="$cp" install
127   mkdir -p $ROOTSYS/lib/python
128   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
196 #
129  
130   # SCRAM ToolBox toolfile
131   mkdir -p %i/etc/scram.d
# Line 233 | Line 165 | EOF_TOOLFILE
165  
166   # roothistmatrix toolfile
167   cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
168 <  <tool name="roothistmatrix" version="%v">
168 >  <tool name="roothistmatrix" version="%v">
169      <info url="http://root.cern.ch/root/"/>
170      <lib name="Hist"/>
171      <lib name="Matrix"/>
# Line 243 | Line 175 | EOF_TOOLFILE
175  
176   # rootgpad toolfile
177   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
178 <  <tool name="rootgpad" version="%v">
178 >  <tool name="rootgpad" version="%v">
179      <info url="http://root.cern.ch/root/"/>
180      <lib name="Gpad"/>
181      <lib name="Graf"/>
# Line 387 | Line 319 | EOF_TOOLFILE
319  
320   %post
321   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