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.195 by elmer, Thu Apr 8 15:28:15 2010 UTC

#	Line 6 | Line 6 | Source: ftp://root.cern.ch/%n/%{n}_v%{re
6		%define closingbrace )
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
11	<	Patch2:  root-5.22-00-TMVA-shut-the-hell-up-for-once
12	<	Patch3:  root-5.22-00a-TMVA-shut-the-hell-up-again
13	<	Patch4:  root-5.22-00d-fireworks-graf3d-gui
14	<	Patch5:  root-5.22-00a-roofit-silence-static-printout
9	>	Patch0: root-5.18-00-libpng
10	>	Patch1: root-5.21-04-CINT-maxlongline
11	>	Patch2: root-5.22-00-TMVA-shut-the-hell-up-for-once
12	>	Patch3: root-5.22-00a-TMVA-shut-the-hell-up-again
13	>	Patch4: root-5.22-00d-fireworks-graf3d-gui
14	>	Patch5: root-5.22-00a-roofit-silence-static-printout
15		Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
16		Patch7: root-5.22-00a-th1
17	<	Patch8: root-5.22-00a-smatrix
17	>	Patch8: root-5.22-00d-makelib-ldl
18		Patch9: root-5.22-00a-fireworks1
19		Patch10: root-5.22-00a-gcc44
20		Patch11: root-5.22-00a-fireworks2
#	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	>	Patch21: root-5.22-00d-fireworks7
31	>	Patch22: root-5.22-00d-TMath-Vavilov
32	>	Patch23: root-5.22-00d-TBranchElement-dropped-data-member
33
34		%define cpu %(echo %cmsplatf | cut -d_ -f2)
35
#	Line 76 | Line 80 | rm graf3d/gl/src/gl2ps.c.orig
80		%patch16 -p1
81		%patch17 -p1
82		%patch19 -p1
83	+	%patch20 -p1
84	+	%patch21 -p1
85	+	%patch22 -p1
86	+	%patch23 -p1
87
88		case %gccver in
89		4.3.*)
#	Line 143 | Line 151 | case $(uname)-$(uname -m) in
151		Linux-i*86)
152		./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
153		Darwin*)
154	<	./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
154	>	case %cmsplatf in
155	>	*_ia32_* )
156	>	comparch=i386 ;;
157	>	*_amd64_* )
158	>	comparch=x86_64 ;;
159	>	* )
160	>	comparch=ppc ;;
161	>	esac
162	>	export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
163	>	./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
164		Linux-ppc64*)
165		./configure linux $CONFIG_ARGS --disable-rfio;;
166		esac
#	Line 264 | Line 281 | cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
281		</tool>
282		EOF_TOOLFILE
283
284	<	# (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
285	<	# have been removed for the moment)
284	>	# rootinteractive toolfile (GQt/qt lib dependencies
285	>	# have been moved to rootqt.xml)
286		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
287		<tool name="rootinteractive" version="%v">
288		<info url="http://root.cern.ch/root/"/>
289		<lib name="Rint"/>
273	–	<lib name="GQt"/>
290		<lib name="Gui"/>
275	–	<use name="qt"/>
291		<use name="libjpg"/>
292		<use name="libpng"/>
293		<use name="rootgpad"/>
294		</tool>
295		EOF_TOOLFILE
296
297	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
298	+	<tool name="rootqt" version="%v">
299	+	<info url="http://root.cern.ch/root/"/>
300	+	<lib name="GQt"/>
301	+	<use name="qt"/>
302	+	</tool>
303	+	EOF_TOOLFILE
304	+
305		# rootmath toolfile
306		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
307		<tool name="rootmath" version="%v">

Diff Legend

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