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.185 by elmer, Wed Dec 9 12:59:11 2009 UTC vs.
Revision 1.191 by dsr, Wed Feb 24 16:00:39 2010 UTC

#	Line 25 | Line 25 | Patch15: root-5.22-00d-fireworks5
25		Patch16: root-5.22-00d-genreflex_python26_popen3
26		Patch17: root-5.22-00d-fireworks6
27		Patch18: root-5.22-00d-linker-gnu-hash-style
28	<	Patch19: root-5.22-00d-TFile-version3-Init
28	>	Patch19: root-5.22-00d-TFile-version3-Init
29	>	Patch20: root-5.22-00d-cint-namespace
30
31		%define cpu %(echo %cmsplatf | cut -d_ -f2)
32
#	Line 76 | Line 77 | rm graf3d/gl/src/gl2ps.c.orig
77		%patch16 -p1
78		%patch17 -p1
79		%patch19 -p1
80	+	%patch20 -p1
81
82		case %gccver in
83		4.3.*)
#	Line 143 | Line 145 | case $(uname)-$(uname -m) in
145		Linux-i*86)
146		./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
147		Darwin*)
148	<	./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
148	>	case %cmsplatf in
149	>	*_ia32_* )
150	>	comparch=i386 ;;
151	>	*_amd64_* )
152	>	comparch=x86_64 ;;
153	>	* )
154	>	comparch=ppc ;;
155	>	esac
156	>	export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
157	>	./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
158		Linux-ppc64*)
159		./configure linux $CONFIG_ARGS --disable-rfio;;
160		esac
#	Line 264 | Line 275 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
275		</tool>
276		EOF_TOOLFILE
277
278	<	# (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
279	<	# have been removed for the moment)
278	>	# rootinteractive toolfile (GQt/qt lib dependencies
279	>	# have been moved to rootqt.xml)
280		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
281		<tool name="rootinteractive" version="%v">
282		<info url="http://root.cern.ch/root/"/>
283		<lib name="Rint"/>
273	–	<lib name="GQt"/>
284		<lib name="Gui"/>
275	–	<use name="qt"/>
285		<use name="libjpg"/>
286		<use name="libpng"/>
287		<use name="rootgpad"/>
288		</tool>
289		EOF_TOOLFILE
290
291	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
292	+	<tool name="rootqt" version="%v">
293	+	<info url="http://root.cern.ch/root/"/>
294	+	<lib name="GQt"/>
295	+	<use name="qt"/>
296	+	</tool>
297	+	EOF_TOOLFILE
298	+
299		# rootmath toolfile
300		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
301		<tool name="rootmath" version="%v">

Diff Legend

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