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.216 by elmer, Fri Oct 29 09:33:59 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.22.00d
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 echo false;; esac)
8 > %define ismac %(case %cmsplatf in osx*%closingbrace echo true;; *%closingbrace e
9 > cho false;; esac)
10  
11 < Patch0: root-5.22-00d-externals
12 < Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
13 < Patch2: root-5.22-00-TMVA-shut-the-hell-up-for-once
14 < Patch3: root-5.22-00a-TMVA-shut-the-hell-up-again
15 < Patch4: root-5.22-00d-fireworks-graf3d-gui-ko
16 < Patch5: root-5.22-00a-roofit-silence-static-printout
17 < Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
18 < Patch7: root-5.22-00a-th1
19 < Patch8: root-5.22-00d-makelib-ldl
20 < Patch9: root-5.22-00a-fireworks1
21 < Patch10: root-5.22-00a-gcc44
22 < Patch11: root-5.22-00a-fireworks2
23 < Patch12: root-5.22-00a-fireworks3
24 < Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
24 < Patch14: root-5.22-00a-fireworks4
25 < Patch15: root-5.22-00d-fireworks5
26 < Patch16: root-5.22-00d-genreflex_python26_popen3
27 < Patch17: root-5.22-00d-fireworks6
28 < Patch18: root-5.22-00d-linker-gnu-hash-style
29 < Patch19: root-5.22-00d-TFile-version3-Init
30 < Patch20: root-5.22-00d-cint-namespace
31 < Patch21: root-5.22-00d-fireworks7
32 < Patch22: root-5.22-00d-TMath-Vavilov
33 < Patch23: root-5.22-00d-TBranchElement-dropped-data-member
34 < Patch24: root-5.22-00d-fireworks8-ko
35 < Patch25: root-5.22-00d-fix-python-shebang
36 < Patch26: root-5.22-00d-RootsysOnMac
37 < Patch27: root-5.22-00d-TString-Clear
38 < Patch28: root-5.22-00d-libgfortran-dylib-detection
39 < Patch29: root-5.22-00d-cint-dll-correct-install-name
40 < Patch30: root-5.22-00d-fireworks9
11 > Patch0: root-5.27-06-externals
12 > Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
13 > Patch2: root-5.22-00a-roofit-silence-static-printout
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 libjpg pcre python fftw3
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 libpng zlib libungif libtiff gfortran-macosx
35 > Requires: openssl zlib gfortran-macosx
36   %endif
37  
38   %if "%online-%ismac" == "false-false"
39 < Requires: qt openssl libpng zlib libungif xrootd libtiff
39 > Requires: openssl zlib qt xrootd
40   %endif
41  
42   %prep
# Line 60 | Line 44 | Requires: qt openssl libpng zlib libungi
44   %patch0 -p1
45   %patch1 -p1
46   %patch2 -p1
47 < %patch3 -p1
47 > # patch3 is OS version dependent, see below
48   %patch4 -p1
65 –
49   %patch5 -p1
50   %patch6 -p1
51   %patch7 -p1
52   %patch8 -p1
53   %patch9 -p1
54 <
72 < # patch10 is compiler version dependent, see below
73 < # Work around patch issue.
74 < #rm graf3d/gl/src/gl2ps.c
54 > %patch10 -p1
55   %patch11 -p1
56   %patch12 -p1
77 – # patch13 is compiler version dependent, see below
78 –
79 – # work around patch issue...
80 – #rm graf3d/gl/src/gl2ps.c
81 – %patch14 -p1
82 – #work around patch issues in patch14(?)
83 – #rm graf3d/eve/inc/TEveLegoOverlay.h.orig
84 – #rm graf3d/eve/src/TEveLegoOverlay.cxx
85 – %patch15 -p1
86 – %patch16 -p1
87 – %patch17 -p1
88 – %patch19 -p1
89 – %patch20 -p1
90 – %patch21 -p1
91 – %patch22 -p1
92 – %patch23 -p1
93 – %patch24 -p1
94 – %patch25 -p1
95 – %patch26 -p1
96 – %patch27 -p1
97 – %patch28 -p2
98 – %patch29 -p1
99 – %patch30 -p1
100 –
101 – case %gccver in
102 –  4.3.*)
57   %patch13 -p1
104 –  ;;
105 –  4.4.*)
106 – %patch10 -p1
107 –  ;;
108 – esac
58  
59 < # The following patch can only be applied on SLC5 or later (extra linker
59 > # The following patch can only be applied on SLC5 or later (extra linker
60   # options only available with the SLC5 binutils)
61   case %cmsplatf in
62    slc5_* | slc5onl_* )
63 < %patch18 -p1
63 > %patch3 -p1
64    ;;
65   esac
66  
# Line 126 | Line 75 | export PYTHONV=$(echo $PYTHON_VERSION |
75   # Use system qt. Also skip xrootd and odbc for online case:
76  
77   EXTRA_CONFIG_ARGS="--with-f77=/usr
129 –             --disable-xrootd
78               --disable-odbc
79 <             --disable-qt --disable-qtgsi"
79 >             --disable-qt --disable-qtgsi --disable-astiff"
80   %else
81   export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
82   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
135 –             --with-xrootd=$XROOTD_ROOT
83               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
84               --with-ssl-incdir=${OPENSSL_ROOT}/include
85               --with-ssl-libdir=${OPENSSL_ROOT}/lib
# Line 155 | Line 102 | CONFIG_ARGS="--enable-table
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 165 | Line 113 | CONFIG_ARGS="--enable-table
113  
114   case $(uname)-$(uname -m) in
115    Linux-x86_64)
116 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
116 >    ./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 ;;
117    Linux-i*86)
118 <    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
118 >    ./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 ;;
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
# Line 211 | Line 165 | export ROOTSYS=%i
165   make INSTALL="$cp" INSTALLDATA="$cp" install
166   mkdir -p $ROOTSYS/lib/python
167   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
214 – #
168  
169   # SCRAM ToolBox toolfile
170   mkdir -p %i/etc/scram.d
# Line 251 | Line 204 | EOF_TOOLFILE
204  
205   # roothistmatrix toolfile
206   cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
207 <  <tool name="roothistmatrix" version="%v">
207 >  <tool name="roothistmatrix" version="%v">
208      <info url="http://root.cern.ch/root/"/>
209      <lib name="Hist"/>
210      <lib name="Matrix"/>
# Line 261 | Line 214 | EOF_TOOLFILE
214  
215   # rootgpad toolfile
216   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
217 <  <tool name="rootgpad" version="%v">
217 >  <tool name="rootgpad" version="%v">
218      <info url="http://root.cern.ch/root/"/>
219      <lib name="Gpad"/>
220      <lib name="Graf"/>
# Line 405 | Line 358 | EOF_TOOLFILE
358  
359   %post
360   perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
361 +

Diff Legend

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