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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.144 by elmer, Thu Feb 12 19:46:01 2009 UTC vs.
Revision 1.153 by muzaffar, Wed Apr 8 07:04:44 2009 UTC

#	Line 7 \| Line 7 \| Source: ftp://root.cern.ch/%n/%{n}_v%{re
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
18		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
19		%define pythonv %(echo $PYTHON_VERSION \| cut -d. -f1,2)
#	Line 14 \| Line 21 \| Patch2: root-5.22-00-TMVA-shut-the-hell
21		Requires: gccxml gsl castor libjpg dcap pcre python
22
23		%if "%cmsplatf" != "slc4onl_ia32_gcc346"
24	<	Requires: qt openssl mysql libpng zlib libungif
24	>	Requires: qt openssl mysql libpng zlib libungif xrootd
25		%else
26		%define skiplibtiff true
27		%endif
#	Line 32 \| Line 39 \| Requires: libtiff
39		%patch0 -p1
40		%patch1 -p1
41		%patch2 -p1
42	+	%patch3 -p1
43	+	%patch4 -p1
44	+	%patch5 -p1
45	+	%patch6 -p1
46
47		%build
48		mkdir -p %i
#	Line 48 \| Line 59 \| EXTRA_CONFIG_ARGS="
59		--enable-qt"
60		%else
61		EXTRA_CONFIG_ARGS="
62	+	--with-xrootd=$XROOTD_ROOT
63		--enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
64		--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
65		--with-ssl-incdir=${OPENSSL_ROOT}/include
#	Line 94 \| Line 106 \| case $(uname)-$(uname -p) in
106		./configure linux $CONFIG_ARGS --disable-rfio;;
107		esac
108
109	<	make %makeprocesses
109	>	case %cmsplatf in
110	>	osx*)
111	>	makeopts=
112	>	;;
113	>	*)
114	>	makeopts="%makeprocesses"
115	>	;;
116	>	esac
117	>
118	>	make $makeopts
119		make cintdlls
120	+
121		%install
122		# Override installers if we are using GNU fileutils cp. On OS X
123		# ROOT's INSTALL is defined to "cp -pPR", which only works with
#	Line 121 \| Line 143 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
143		<doc type=BuildSystem::ToolDoc version=1.0>
144		<Tool name=rootcore version=%v>
145		<info url="http://root.cern.ch/root/"></info>
124	–	<lib name=Cint>
125	–	<lib name=Core>
126	–	<lib name=RIO>
127	–	<lib name=Net>
146		<lib name=Tree>
147	+	<lib name=Net>
148	+	<lib name=Thread>
149	+	<lib name=MathCore>
150	+	<lib name=RIO>
151	+	<lib name=Core>
152	+	<lib name=Cint>
153		<Client>
154		<Environment name=ROOTCORE_BASE default="%i"></Environment>
155		<Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
#	Line 155 \| Line 179 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
179		<doc type=BuildSystem::ToolDoc version=1.0>
180		<Tool name=roothistmatrix version=%v>
181		<info url="http://root.cern.ch/root/"></info>
182	+	<lib name=Gpad>
183	+	<lib name=Graf>
184		<lib name=Hist>
185		<lib name=Matrix>
186		<use name=ROOTCore>
#	Line 177 \| Line 203 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
203		<Tool name=rootgraphics version=%v>
204		<info url="http://root.cern.ch/root/"></info>
205		<lib name=TreePlayer>
180	–	<lib name=Gpad>
206		<lib name=Graf3d>
182	–	<lib name=Graf>
183	–	<lib name=Hist>
184	–	<lib name=Matrix>
185	–	<lib name=Physics>
207		<lib name=Postscript>
208	<	<use name=ROOTCore>
208	>	<use name=ROOTPhysics>
209		</Tool>
210		EOF_TOOLFILE
211
#	Line 199 \| Line 220 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
220		</Tool>
221		EOF_TOOLFILE
222
223	<	# rootinteractive toolfile
223	>	# (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
224	>	# have been removed for the moment)
225		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
226		<doc type=BuildSystem::ToolDoc version=1.0>
227		<Tool name=rootinteractive version=%v>
228		<info url="http://root.cern.ch/root/"></info>
229		<lib name=Rint>
208	–	<lib name=GQt>
209	–	<use name=qt>
230		<use name=libjpg>
231		<use name=libpng>
232		<use name=ROOT>
233		</Tool>
234		EOF_TOOLFILE
235
236	+	# rootinteractive2 toolfile (temporary, to allow access to Qt4)
237	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive2
238	+	<doc type=BuildSystem::ToolDoc version=1.0>
239	+	<Tool name=rootinteractive2 version=%v>
240	+	<info url="http://root.cern.ch/root/"></info>
241	+	<lib name=GQt>
242	+	<lib name=Gui>
243	+	<use name=qt>
244	+	<use name=RootInteractive>
245	+	</Tool>
246	+	EOF_TOOLFILE
247	+
248	+
249		# rootmath toolfile
250		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
251		<doc type=BuildSystem::ToolDoc version=1.0>
252		<Tool name=rootmath version=%v>
253		<info url="http://root.cern.ch/root/"></info>
221	–	<lib name=MathCore>
222	–	<lib name=MathMore>
254		<lib name=GenVector>
255	+	<lib name=MathMore>
256		<use name=ROOTCore>
257		<use name=gsl>
258		</Tool>
#	Line 271 \| Line 303 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
303		<Tool name=roothtml version=%v>
304		<info url="http://root.cern.ch/root/"></info>
305		<lib name=Html>
306	<	<use name=ROOT>
306	>	<use name=RootHistMatrix>
307		</Tool>
308		EOF_TOOLFILE
309
#	Line 280 \| Line 312 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
312		<doc type=BuildSystem::ToolDoc version=1.0>
313		<Tool name=rootroofit version=%v>
314		<info url="http://root.cern.ch/root/"></info>
283	–	<lib name=RooFitCore>
315		<lib name=RooFit>
316	+	<lib name=RooFitCore>
317		<use name=ROOTMinuit>
318		<use name=ROOTHtml>
319		</Tool>
#	Line 293 \| Line 325 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
325		<Tool name=rootmlp version=%v>
326		<info url="http://root.cern.ch/root/"></info>
327		<lib name=MLP>
328	<	<use name=ROOT>
328	>	<use name=RootGraphics>
329		</Tool>
330		EOF_TOOLFILE
331
#	Line 312 \| Line 344 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
344		<doc type=BuildSystem::ToolDoc version=1.0>
345		<Tool name=rootthread version=%v>
346		<info url="http://root.cern.ch/root/"></info>
315	–	<lib name=Thread>
347		<use name=ROOTCore>
348		</Tool>
349		EOF_TOOLFILE

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.144 by elmer, Thu Feb 12 19:46:01 2009 UTC vs. Revision 1.153 by muzaffar, Wed Apr 8 07:04:44 2009 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.144 by elmer, Thu Feb 12 19:46:01 2009 UTC vs.
Revision 1.153 by muzaffar, Wed Apr 8 07:04:44 2009 UTC