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.132 by elmer, Thu Jan 15 00:59:45 2009 UTC vs.
Revision 1.152 by dlange, Tue Apr 7 02:01:59 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.22.00
1 > ### RPM lcg root 5.22.00a
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  
7   Patch0:  root-5.18-00-libpng
8   Patch1:  root-5.21-04-CINT-maxlongline
9 < Patch2:  root-5.22-00-TClass-Clone
10 < Patch3:  root-5.22-00-gendict
11 < Patch4:  root-5.22-00-RootSys
9 > Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
10 > Patch3:  root-5.22-00a-TMVA-shut-the-hell-up-again
11 > Patch4:  root-5.22-00a-CINTFunctional
12 > Patch5:  root-5.22-00a-TClass
13 > Patch6:  root-5.22-00a-fireworks-graf3d-gui
14 > Patch7:  root-5.22-00a-Reflex-Class
15 > Patch8:  root-5.22-00a-Cintex
16 > Patch9:  root-5.22-00a-roofit-silence-static-printout
17  
18   %define cpu %(echo %cmsplatf | cut -d_ -f2)
19   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 16 | Line 21 | Patch4:  root-5.22-00-RootSys
21   Requires: gccxml gsl castor libjpg dcap pcre python
22  
23   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
24 < Requires: qt openssl mysql libpng zlib libungif
24 > Requires: qt openssl mysql libpng zlib libungif xrootd
25   %else
26   %define skiplibtiff true
27   %endif
# Line 36 | Line 41 | Requires: libtiff
41   %patch2 -p1
42   %patch3 -p1
43   %patch4 -p1
44 + %patch5 -p1
45 + %patch6 -p1
46  
47   %build
48   mkdir -p %i
# Line 52 | Line 59 | EXTRA_CONFIG_ARGS="
59               --enable-qt"
60   %else
61   EXTRA_CONFIG_ARGS="
62 +             --with-xrootd=$XROOTD_ROOT
63               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
64               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
65               --with-ssl-incdir=${OPENSSL_ROOT}/include
# Line 89 | Line 97 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
97  
98   case $(uname)-$(uname -p) in
99    Linux-x86_64)
100 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
100 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
101    Linux-i*86)
102      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
103    Darwin*)
# Line 98 | Line 106 | case $(uname)-$(uname -p) in
106      ./configure linux $CONFIG_ARGS --disable-rfio;;
107   esac
108  
109 < make  %makeprocesses
109 > case %cmsplatf in
110 >  osx*)
111 >   makeopts=
112 >  ;;
113 >  *)
114 >   makeopts="%makeprocesses"
115 >  ;;
116 > esac
117 >
118 > make $makeopts
119   make cintdlls
120 +
121   %install
122   # Override installers if we are using GNU fileutils cp.  On OS X
123   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 203 | Line 221 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
221   </Tool>
222   EOF_TOOLFILE
223  
224 < # rootinteractive toolfile
224 > # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
225 > # have been removed for the moment)
226   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
227   <doc type=BuildSystem::ToolDoc version=1.0>
228   <Tool name=rootinteractive version=%v>
229   <info url="http://root.cern.ch/root/"></info>
230   <lib name=Rint>
231 + <use name=libjpg>
232 + <use name=libpng>
233 + <use name=ROOT>
234 + </Tool>
235 + EOF_TOOLFILE
236 +
237 + # rootinteractive2 toolfile (temporary, to allow access to Qt4)
238 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
239 + <doc type=BuildSystem::ToolDoc version=1.0>
240 + <Tool name=rootinteractive2 version=%v>
241 + <info url="http://root.cern.ch/root/"></info>
242 + <lib name=Rint>
243   <lib name=GQt>
244   <use name=qt>
245   <use name=libjpg>
# Line 217 | Line 248 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
248   </Tool>
249   EOF_TOOLFILE
250  
251 +
252   # rootmath toolfile
253   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
254   <doc type=BuildSystem::ToolDoc version=1.0>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines