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.175 by elmer, Thu Sep 3 17:34:39 2009 UTC vs.
Revision 1.180 by elmer, Tue Nov 3 14:17:05 2009 UTC

#	Line 1 | Line 1
1		### RPM lcg root 5.22.00d
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 flase;; esac)
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
#	Line 21 | Line 21 | 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
26		%define cpu %(echo %cmsplatf | cut -d_ -f2)
26	–	%define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
27
28		Requires: gccxml gsl castor libjpg dcap pcre python
29
#	Line 62 | Line 62 | Requires: libtiff
62
63		# work around patch issue...
64		rm graf3d/gl/src/gl2ps.c
65	–	# doesn't work at the moment %patch24 -p1
65		%patch14 -p1
66	<	#work around patch issues in patch24
66	>	#work around patch issues in patch14(?)
67		rm graf3d/eve/inc/TEveLegoOverlay.h.orig
68		rm graf3d/eve/src/TEveLegoOverlay.cxx
69		rm graf3d/gl/inc/gl2ps.h.orig
70		rm graf3d/gl/src/gl2ps.c.orig
71	+	%patch15 -p1
72
73		case %gccver in
74		4.3.*)
#	Line 83 | Line 83 | esac
83
84		mkdir -p %i
85		export ROOTSYS=%_builddir/root
86	+	export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
87
88		%if "%online" == "true"
89		# Build without mysql, and use system qt.
#	Line 108 | Line 109 | CONFIG_ARGS="--enable-table
109		--disable-builtin-freetype
110		--disable-builtin-zlib
111		--with-gccxml=${GCCXML_ROOT}
112	<	--enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
112	>	--enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
113		--enable-explicitlink
114		--enable-mathmore
115		--enable-reflex
116		--enable-cintex
117		--enable-minuit2
117	–	--enable-roofit
118		--disable-ldap
119		--disable-krb5
120		--with-gsl-incdir=${GSL_ROOT}/include
#	Line 341 | Line 341 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
341		</Tool>
342		EOF_TOOLFILE
343
344	–	# rootroofit toolfile
345	–	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
346	–	<doc type=BuildSystem::ToolDoc version=1.0>
347	–	<Tool name=rootroofit version=%v>
348	–	<info url="http://root.cern.ch/root/"></info>
349	–	<lib name=RooFit>
350	–	<lib name=RooFitCore>
351	–	<use name=ROOTMinuit>
352	–	</Tool>
353	–	EOF_TOOLFILE
354	–
344		# rootmlp toolfile
345		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp
346		<doc type=BuildSystem::ToolDoc version=1.0>
#	Line 395 | Line 384 | EOF_TOOLFILE
384		%{relocateConfig}etc/scram.d/rootminuit2
385		%{relocateConfig}etc/scram.d/rootrflx
386		%{relocateConfig}etc/scram.d/roothtml
398	–	%{relocateConfig}etc/scram.d/rootroofit
387		%{relocateConfig}etc/scram.d/rootmlp
388		%{relocateConfig}etc/scram.d/roottmva
389		%{relocateConfig}etc/scram.d/rootthread

Diff Legend

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