[ViewVC] Diff of: cvsroot/COMP/CMSDIST/root.spec

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.152 by dlange, Tue Apr 7 02:01:59 2009 UTC vs.
Revision 1.162 by dlange, Thu May 14 07:56:00 2009 UTC

#	Line 4 \| Line 4
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
7	<	Patch0: root-5.18-00-libpng
7	>	Patch0: root-5.18-00-libpng
8		Patch1: root-5.21-04-CINT-maxlongline
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
#	Line 14 \| Line 14 \| Patch6: root-5.22-00a-fireworks-graf3d-
14		Patch7: root-5.22-00a-Reflex-Class
15		Patch8: root-5.22-00a-Cintex
16		Patch9: root-5.22-00a-roofit-silence-static-printout
17	+	Patch10: root-5.22-00a-TMVA-just-shut-the-hell-up
18	+	Patch11: root-5.22-00a-th1
19	+	Patch12: root-5.22-00a-smatrix
20	+	Patch13: root-5.22-00a-fireworks1
21	+	Patch14: root-5.22-00a-Reflex-gendict_selclass
22	+	Patch15: root-5.22-00a-MatrixInversion
23	+	Patch16: root-5.22-00a-gcc44
24	+	Patch17: root-5.22-00a-fireworks2
25	+	Patch18: root-5.22-00a-fireworks3
26	+	Patch19: root-5.22-00a-TBranchElement
27	+	Patch20: root-5.22-00a-tmplt
28	+	Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
29
30		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
31		%define pythonv %(echo $PYTHON_VERSION \| cut -d. -f1,2)
#	Line 43 \| Line 55 \| Requires: libtiff
55		%patch4 -p1
56		%patch5 -p1
57		%patch6 -p1
58	<
58	>	%patch7 -p0
59	>	%patch8 -p0
60	>	%patch9 -p1
61	>	%patch10 -p1
62	>	%patch11 -p1
63	>	%patch12 -p1
64	>	%patch13 -p1
65	>	%patch14 -p0
66	>	%patch15 -p0
67	>	%patch16 -p1
68	>	%patch17 -p1
69	>	%patch18 -p1
70	>	%patch19 -p0
71	>	%patch20 -p0
72	>	%patch21 -p0
73	>	# work around patch issue...
74	>	rm graf3d/gl/src/gl2ps.c
75	>
76	>	case %gccver in
77	>	4.4)
78	>	%patch16 -p1
79	>	;;
80	>	esac
81	>
82		%build
83		mkdir -p %i
84		export ROOTSYS=%_builddir/root
#	Line 143 \| Line 178 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
178		<doc type=BuildSystem::ToolDoc version=1.0>
179		<Tool name=rootcore version=%v>
180		<info url="http://root.cern.ch/root/"></info>
146	–	<lib name=Cint>
147	–	<lib name=Core>
148	–	<lib name=RIO>
149	–	<lib name=Net>
181		<lib name=Tree>
182	+	<lib name=Net>
183	+	<lib name=Thread>
184	+	<lib name=MathCore>
185	+	<lib name=RIO>
186	+	<lib name=Core>
187	+	<lib name=Cint>
188		<Client>
189		<Environment name=ROOTCORE_BASE default="%i"></Environment>
190		<Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
#	Line 183 \| Line 220 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
220		</Tool>
221		EOF_TOOLFILE
222
223	+	# rootgpad toolfile
224	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
225	+	<doc type=BuildSystem::ToolDoc version=1.0>
226	+	<Tool name=rootgpad version=%v>
227	+	<info url="http://root.cern.ch/root/"></info>
228	+	<lib name=Gpad>
229	+	<lib name=Graf>
230	+	<use name=roothistmatrix>
231	+	</Tool>
232	+	EOF_TOOLFILE
233	+
234		# rootphysics toolfile
235		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
236		<doc type=BuildSystem::ToolDoc version=1.0>
#	Line 199 \| Line 247 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
247		<Tool name=rootgraphics version=%v>
248		<info url="http://root.cern.ch/root/"></info>
249		<lib name=TreePlayer>
202	–	<lib name=Gpad>
250		<lib name=Graf3d>
204	–	<lib name=Graf>
205	–	<lib name=Hist>
206	–	<lib name=Matrix>
207	–	<lib name=Physics>
251		<lib name=Postscript>
252	<	<use name=ROOTCore>
252	>	<use name=rootgpad>
253		</Tool>
254		EOF_TOOLFILE
255
#	Line 228 \| Line 271 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
271		<Tool name=rootinteractive version=%v>
272		<info url="http://root.cern.ch/root/"></info>
273		<lib name=Rint>
231	–	<use name=libjpg>
232	–	<use name=libpng>
233	–	<use name=ROOT>
234	–	</Tool>
235	–	EOF_TOOLFILE
236	–
237	–	# rootinteractive2 toolfile (temporary, to allow access to Qt4)
238	–	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
239	–	<doc type=BuildSystem::ToolDoc version=1.0>
240	–	<Tool name=rootinteractive2 version=%v>
241	–	<info url="http://root.cern.ch/root/"></info>
242	–	<lib name=Rint>
274		<lib name=GQt>
275	+	<lib name=Gui>
276		<use name=qt>
277		<use name=libjpg>
278		<use name=libpng>
279	<	<use name=ROOT>
279	>	<use name=rootgpad>
280		</Tool>
281		EOF_TOOLFILE
282
251	–
283		# rootmath toolfile
284		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
285		<doc type=BuildSystem::ToolDoc version=1.0>
286		<Tool name=rootmath version=%v>
287		<info url="http://root.cern.ch/root/"></info>
257	–	<lib name=MathCore>
258	–	<lib name=MathMore>
288		<lib name=GenVector>
289	+	<lib name=MathMore>
290		<use name=ROOTCore>
291		<use name=gsl>
292		</Tool>
#	Line 268 \| Line 298 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
298		<Tool name=rootminuit version=%v>
299		<info url="http://root.cern.ch/root/"></info>
300		<lib name=Minuit>
301	<	<use name=ROOT>
301	>	<use name=rootgpad>
302		</Tool>
303		EOF_TOOLFILE
304
#	Line 278 \| Line 308 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
308		<Tool name=rootminuit2 version=%v>
309		<info url="http://root.cern.ch/root/"></info>
310		<lib name=Minuit2>
311	<	<use name=ROOT>
311	>	<use name=rootgpad>
312		</Tool>
313		EOF_TOOLFILE
314
#	Line 307 \| Line 337 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
337		<Tool name=roothtml version=%v>
338		<info url="http://root.cern.ch/root/"></info>
339		<lib name=Html>
340	<	<use name=ROOT>
340	>	<use name=rootgpad>
341		</Tool>
342		EOF_TOOLFILE
343
#	Line 316 \| Line 346 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
346		<doc type=BuildSystem::ToolDoc version=1.0>
347		<Tool name=rootroofit version=%v>
348		<info url="http://root.cern.ch/root/"></info>
319	–	<lib name=RooFitCore>
349		<lib name=RooFit>
350	+	<lib name=RooFitCore>
351		<use name=ROOTMinuit>
322	–	<use name=ROOTHtml>
352		</Tool>
353		EOF_TOOLFILE
354
#	Line 329 \| Line 358 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
358		<Tool name=rootmlp version=%v>
359		<info url="http://root.cern.ch/root/"></info>
360		<lib name=MLP>
361	<	<use name=ROOT>
361	>	<use name=RootGraphics>
362		</Tool>
363		EOF_TOOLFILE
364
#	Line 340 \| Line 369 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
369		<info url="http://root.cern.ch/root/"></info>
370		<lib name=TMVA>
371		<use name=ROOTMLP>
372	+	<use name=rootminuit>
373		</Tool>
374		EOF_TOOLFILE
375
#	Line 348 \| Line 378 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
378		<doc type=BuildSystem::ToolDoc version=1.0>
379		<Tool name=rootthread version=%v>
380		<info url="http://root.cern.ch/root/"></info>
351	–	<lib name=Thread>
381		<use name=ROOTCore>
382		</Tool>
383		EOF_TOOLFILE

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.152 by dlange, Tue Apr 7 02:01:59 2009 UTC vs. Revision 1.162 by dlange, Thu May 14 07:56:00 2009 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.152 by dlange, Tue Apr 7 02:01:59 2009 UTC vs.
Revision 1.162 by dlange, Thu May 14 07:56:00 2009 UTC