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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.145 by elmer, Thu Feb 12 23:28:10 2009 UTC vs.
Revision 1.160 by dlange, Sat May 9 15:49:24 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
11	+	Patch4: root-5.22-00a-CINTFunctional
12	+	Patch5: root-5.22-00a-TClass
13	+	Patch6: root-5.22-00a-fireworks-graf3d-gui
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
28		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
29		%define pythonv %(echo $PYTHON_VERSION \| cut -d. -f1,2)
#	Line 32 \| Line 49 \| Requires: libtiff
49		%patch0 -p1
50		%patch1 -p1
51		%patch2 -p1
52	<
52	>	%patch3 -p1
53	>	%patch4 -p1
54	>	%patch5 -p1
55	>	%patch6 -p1
56	>	%patch7 -p0
57	>	%patch8 -p0
58	>	%patch9 -p1
59	>	%patch10 -p1
60	>	%patch11 -p1
61	>	%patch12 -p1
62	>	%patch13 -p1
63	>	%patch14 -p0
64	>	%patch15 -p0
65	>	%patch16 -p1
66	>	%patch17 -p1
67	>	%patch18 -p1
68	>	%patch19 -p0
69	>
70	>	case %gccver in
71	>	4.4)
72	>	%patch16 -p1
73	>	;;
74	>	esac
75	>
76		%build
77		mkdir -p %i
78		export ROOTSYS=%_builddir/root
#	Line 95 \| Line 135 \| case $(uname)-$(uname -p) in
135		./configure linux $CONFIG_ARGS --disable-rfio;;
136		esac
137
138	<	make %makeprocesses
138	>	case %cmsplatf in
139	>	osx*)
140	>	makeopts=
141	>	;;
142	>	*)
143	>	makeopts="%makeprocesses"
144	>	;;
145	>	esac
146	>
147	>	make $makeopts
148		make cintdlls
149	+
150		%install
151		# Override installers if we are using GNU fileutils cp. On OS X
152		# ROOT's INSTALL is defined to "cp -pPR", which only works with
#	Line 122 \| Line 172 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
172		<doc type=BuildSystem::ToolDoc version=1.0>
173		<Tool name=rootcore version=%v>
174		<info url="http://root.cern.ch/root/"></info>
125	–	<lib name=Cint>
126	–	<lib name=Core>
127	–	<lib name=RIO>
128	–	<lib name=Net>
175		<lib name=Tree>
176	+	<lib name=Net>
177	+	<lib name=Thread>
178	+	<lib name=MathCore>
179	+	<lib name=RIO>
180	+	<lib name=Core>
181	+	<lib name=Cint>
182		<Client>
183		<Environment name=ROOTCORE_BASE default="%i"></Environment>
184		<Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
#	Line 162 \| Line 214 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
214		</Tool>
215		EOF_TOOLFILE
216
217	+	# rootgpad toolfile
218	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad
219	+	<doc type=BuildSystem::ToolDoc version=1.0>
220	+	<Tool name=rootgpad version=%v>
221	+	<info url="http://root.cern.ch/root/"></info>
222	+	<lib name=Gpad>
223	+	<lib name=Graf>
224	+	<use name=roothistmatrix>
225	+	</Tool>
226	+	EOF_TOOLFILE
227	+
228		# rootphysics toolfile
229		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics
230		<doc type=BuildSystem::ToolDoc version=1.0>
#	Line 178 \| Line 241 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
241		<Tool name=rootgraphics version=%v>
242		<info url="http://root.cern.ch/root/"></info>
243		<lib name=TreePlayer>
181	–	<lib name=Gpad>
244		<lib name=Graf3d>
183	–	<lib name=Graf>
184	–	<lib name=Hist>
185	–	<lib name=Matrix>
186	–	<lib name=Physics>
245		<lib name=Postscript>
246	<	<use name=ROOTCore>
246	>	<use name=rootgpad>
247		</Tool>
248		EOF_TOOLFILE
249
#	Line 200 \| Line 258 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
258		</Tool>
259		EOF_TOOLFILE
260
261	<	# rootinteractive toolfile
261	>	# (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
262	>	# have been removed for the moment)
263		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
264		<doc type=BuildSystem::ToolDoc version=1.0>
265		<Tool name=rootinteractive version=%v>
266		<info url="http://root.cern.ch/root/"></info>
267		<lib name=Rint>
268		<lib name=GQt>
269	+	<lib name=Gui>
270		<use name=qt>
271		<use name=libjpg>
272		<use name=libpng>
273	<	<use name=ROOT>
273	>	<use name=rootgpad>
274		</Tool>
275		EOF_TOOLFILE
276
#	Line 219 \| Line 279 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
279		<doc type=BuildSystem::ToolDoc version=1.0>
280		<Tool name=rootmath version=%v>
281		<info url="http://root.cern.ch/root/"></info>
222	–	<lib name=MathCore>
223	–	<lib name=MathMore>
282		<lib name=GenVector>
283	+	<lib name=MathMore>
284		<use name=ROOTCore>
285		<use name=gsl>
286		</Tool>
#	Line 233 \| Line 292 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
292		<Tool name=rootminuit version=%v>
293		<info url="http://root.cern.ch/root/"></info>
294		<lib name=Minuit>
295	<	<use name=ROOT>
295	>	<use name=rootgpad>
296		</Tool>
297		EOF_TOOLFILE
298
#	Line 243 \| Line 302 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
302		<Tool name=rootminuit2 version=%v>
303		<info url="http://root.cern.ch/root/"></info>
304		<lib name=Minuit2>
305	<	<use name=ROOT>
305	>	<use name=rootgpad>
306		</Tool>
307		EOF_TOOLFILE
308
#	Line 272 \| Line 331 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
331		<Tool name=roothtml version=%v>
332		<info url="http://root.cern.ch/root/"></info>
333		<lib name=Html>
334	<	<use name=ROOT>
334	>	<use name=rootgpad>
335		</Tool>
336		EOF_TOOLFILE
337
#	Line 281 \| Line 340 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
340		<doc type=BuildSystem::ToolDoc version=1.0>
341		<Tool name=rootroofit version=%v>
342		<info url="http://root.cern.ch/root/"></info>
284	–	<lib name=RooFitCore>
343		<lib name=RooFit>
344	+	<lib name=RooFitCore>
345		<use name=ROOTMinuit>
287	–	<use name=ROOTHtml>
346		</Tool>
347		EOF_TOOLFILE
348
#	Line 294 \| Line 352 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
352		<Tool name=rootmlp version=%v>
353		<info url="http://root.cern.ch/root/"></info>
354		<lib name=MLP>
355	<	<use name=ROOT>
355	>	<use name=RootGraphics>
356		</Tool>
357		EOF_TOOLFILE
358
#	Line 305 \| Line 363 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
363		<info url="http://root.cern.ch/root/"></info>
364		<lib name=TMVA>
365		<use name=ROOTMLP>
366	+	<use name=rootminuit>
367		</Tool>
368		EOF_TOOLFILE
369
#	Line 313 \| Line 372 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
372		<doc type=BuildSystem::ToolDoc version=1.0>
373		<Tool name=rootthread version=%v>
374		<info url="http://root.cern.ch/root/"></info>
316	–	<lib name=Thread>
375		<use name=ROOTCore>
376		</Tool>
377		EOF_TOOLFILE

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.145 by elmer, Thu Feb 12 23:28:10 2009 UTC vs. Revision 1.160 by dlange, Sat May 9 15:49:24 2009 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.145 by elmer, Thu Feb 12 23:28:10 2009 UTC vs.
Revision 1.160 by dlange, Sat May 9 15:49:24 2009 UTC