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.149 by elmer, Wed Mar 4 17:55:37 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  
14   %define cpu %(echo %cmsplatf | cut -d_ -f2)
15   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 16 | Line 17 | Patch4:  root-5.22-00-RootSys
17   Requires: gccxml gsl castor libjpg dcap pcre python
18  
19   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
20 < Requires: qt openssl mysql libpng zlib libungif
20 > Requires: qt openssl mysql libpng zlib libungif xrootd
21   %else
22   %define skiplibtiff true
23   %endif
# Line 36 | Line 37 | Requires: libtiff
37   %patch2 -p1
38   %patch3 -p1
39   %patch4 -p1
40 + %patch5 -p1
41  
42   %build
43   mkdir -p %i
# Line 52 | Line 54 | EXTRA_CONFIG_ARGS="
54               --enable-qt"
55   %else
56   EXTRA_CONFIG_ARGS="
57 +             --with-xrootd=$XROOTD_ROOT
58               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
59               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
60               --with-ssl-incdir=${OPENSSL_ROOT}/include
# Line 89 | Line 92 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
92  
93   case $(uname)-$(uname -p) in
94    Linux-x86_64)
95 <    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
95 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
96    Linux-i*86)
97      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
98    Darwin*)
# Line 98 | Line 101 | case $(uname)-$(uname -p) in
101      ./configure linux $CONFIG_ARGS --disable-rfio;;
102   esac
103  
104 < make  %makeprocesses
104 > case %cmsplatf in
105 >  osx*)
106 >   makeopts=
107 >  ;;
108 >  *)
109 >   makeopts="%makeprocesses"
110 >  ;;
111 > esac
112 >
113 > make $makeopts
114   make cintdlls
115 +
116   %install
117   # Override installers if we are using GNU fileutils cp.  On OS X
118   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 203 | Line 216 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
216   </Tool>
217   EOF_TOOLFILE
218  
219 < # rootinteractive toolfile
219 > # (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
220 > # have been removed for the moment)
221   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
222   <doc type=BuildSystem::ToolDoc version=1.0>
223   <Tool name=rootinteractive version=%v>
224   <info url="http://root.cern.ch/root/"></info>
225   <lib name=Rint>
226 + <use name=libjpg>
227 + <use name=libpng>
228 + <use name=ROOT>
229 + </Tool>
230 + EOF_TOOLFILE
231 +
232 + # rootinteractive2 toolfile (temporary, to allow access to Qt4)
233 + cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
234 + <doc type=BuildSystem::ToolDoc version=1.0>
235 + <Tool name=rootinteractive2 version=%v>
236 + <info url="http://root.cern.ch/root/"></info>
237 + <lib name=Rint>
238   <lib name=GQt>
239   <use name=qt>
240   <use name=libjpg>
# Line 217 | Line 243 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
243   </Tool>
244   EOF_TOOLFILE
245  
246 +
247   # rootmath toolfile
248   cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
249   <doc type=BuildSystem::ToolDoc version=1.0>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines