ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/root.spec

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.132 by elmer, Thu Jan 15 00:59:45 2009 UTC vs.
Revision 1.145 by elmer, Thu Feb 12 23:28:10 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
11		%define cpu %(echo %cmsplatf | cut -d_ -f2)
12		%define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
#	Line 16 | Line 14 | Patch4:  root-5.22-00-RootSys
14		Requires: gccxml gsl castor libjpg dcap pcre python
15
16		%if "%cmsplatf" != "slc4onl_ia32_gcc346"
17	<	Requires: qt openssl mysql libpng zlib libungif
17	>	Requires: qt openssl mysql libpng zlib libungif xrootd
18		%else
19		%define skiplibtiff true
20		%endif
#	Line 34 | Line 32 | Requires: libtiff
32		%patch0 -p1
33		%patch1 -p1
34		%patch2 -p1
37	–	%patch3 -p1
38	–	%patch4 -p1
35
36		%build
37		mkdir -p %i
#	Line 52 | Line 48 | EXTRA_CONFIG_ARGS="
48		--enable-qt"
49		%else
50		EXTRA_CONFIG_ARGS="
51	+	--with-xrootd=$XROOTD_ROOT
52		--enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
53		--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
54		--with-ssl-incdir=${OPENSSL_ROOT}/include
#	Line 89 | Line 86 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
86
87		case $(uname)-$(uname -p) in
88		Linux-x86_64)
89	<	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
89	>	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
90		Linux-i*86)
91		./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
92		Darwin*)

Diff Legend

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