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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.130 by elmer, Tue Jan 13 19:44:39 2009 UTC vs.
Revision 1.157 by dlange, Tue May 5 03:19:51 2009 UTC

#	Line 1 \| Line 1
1	<	### RPM lcg root 5.22.00
1	>	### RPM lcg root 5.22.00a
2		## INITENV +PATH PYTHONPATH %i/lib/python
3		## INITENV SET ROOTSYS %i
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
24		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
25		%define pythonv %(echo $PYTHON_VERSION \| cut -d. -f1,2)
#	Line 13 \| Line 27 \| Patch1: root-5.21-04-CINT-maxlongline
27		Requires: gccxml gsl castor libjpg dcap pcre python
28
29		%if "%cmsplatf" != "slc4onl_ia32_gcc346"
30	<	Requires: qt openssl mysql libpng zlib libungif
30	>	Requires: qt openssl mysql libpng zlib libungif xrootd
31		%else
32		%define skiplibtiff true
33		%endif
#	Line 30 \| Line 44 \| Requires: libtiff
44		%setup -n root
45		%patch0 -p1
46		%patch1 -p1
47	<
47	>	%patch2 -p1
48	>	%patch3 -p1
49	>	%patch4 -p1
50	>	%patch5 -p1
51	>	%patch6 -p1
52	>	%patch7 -p0
53	>	%patch8 -p0
54	>	%patch9 -p1
55	>	%patch10 -p1
56	>	%patch11 -p1
57	>	%patch12 -p1
58	>	%patch13 -p1
59	>	%patch14 -p0
60	>	%patch15 -p0
61	>
62		%build
63		mkdir -p %i
64		export ROOTSYS=%_builddir/root
#	Line 46 \| Line 74 \| EXTRA_CONFIG_ARGS="
74		--enable-qt"
75		%else
76		EXTRA_CONFIG_ARGS="
77	+	--with-xrootd=$XROOTD_ROOT
78		--enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
79		--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
80		--with-ssl-incdir=${OPENSSL_ROOT}/include
#	Line 83 \| Line 112 \| CONFIG_ARGS="--with-f77=${GCC_ROOT}
112
113		case $(uname)-$(uname -p) in
114		Linux-x86_64)
115	<	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
115	>	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
116		Linux-i*86)
117		./configure linux $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
118		Darwin*)
#	Line 92 \| Line 121 \| case $(uname)-$(uname -p) in
121		./configure linux $CONFIG_ARGS --disable-rfio;;
122		esac
123
124	<	make %makeprocesses
124	>	case %cmsplatf in
125	>	osx*)
126	>	makeopts=
127	>	;;
128	>	*)
129	>	makeopts="%makeprocesses"
130	>	;;
131	>	esac
132	>
133	>	make $makeopts
134		make cintdlls
135	+
136		%install
137		# Override installers if we are using GNU fileutils cp. On OS X
138		# ROOT's INSTALL is defined to "cp -pPR", which only works with
#	Line 119 \| Line 158 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
158		<doc type=BuildSystem::ToolDoc version=1.0>
159		<Tool name=rootcore version=%v>
160		<info url="http://root.cern.ch/root/"></info>
122	–	<lib name=Cint>
123	–	<lib name=Core>
124	–	<lib name=RIO>
125	–	<lib name=Net>
161		<lib name=Tree>
162	+	<lib name=Net>
163	+	<lib name=Thread>
164	+	<lib name=MathCore>
165	+	<lib name=RIO>
166	+	<lib name=Core>
167	+	<lib name=Cint>
168		<Client>
169		<Environment name=ROOTCORE_BASE default="%i"></Environment>
170		<Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
#	Line 153 \| Line 194 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
194		<doc type=BuildSystem::ToolDoc version=1.0>
195		<Tool name=roothistmatrix version=%v>
196		<info url="http://root.cern.ch/root/"></info>
197	+	<lib name=Gpad>
198	+	<lib name=Graf>
199		<lib name=Hist>
200		<lib name=Matrix>
201		<use name=ROOTCore>
#	Line 175 \| Line 218 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
218		<Tool name=rootgraphics version=%v>
219		<info url="http://root.cern.ch/root/"></info>
220		<lib name=TreePlayer>
178	–	<lib name=Gpad>
221		<lib name=Graf3d>
180	–	<lib name=Graf>
181	–	<lib name=Hist>
182	–	<lib name=Matrix>
183	–	<lib name=Physics>
222		<lib name=Postscript>
223	<	<use name=ROOTCore>
223	>	<use name=ROOTPhysics>
224		</Tool>
225		EOF_TOOLFILE
226
#	Line 197 \| Line 235 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
235		</Tool>
236		EOF_TOOLFILE
237
238	<	# rootinteractive toolfile
238	>	# (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
239	>	# have been removed for the moment)
240		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
241		<doc type=BuildSystem::ToolDoc version=1.0>
242		<Tool name=rootinteractive version=%v>
243		<info url="http://root.cern.ch/root/"></info>
244		<lib name=Rint>
245		<lib name=GQt>
246	+	<lib name=Gui>
247		<use name=qt>
248		<use name=libjpg>
249		<use name=libpng>
#	Line 216 \| Line 256 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
256		<doc type=BuildSystem::ToolDoc version=1.0>
257		<Tool name=rootmath version=%v>
258		<info url="http://root.cern.ch/root/"></info>
219	–	<lib name=MathCore>
220	–	<lib name=MathMore>
259		<lib name=GenVector>
260	+	<lib name=MathMore>
261		<use name=ROOTCore>
262		<use name=gsl>
263		</Tool>
#	Line 269 \| Line 308 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
308		<Tool name=roothtml version=%v>
309		<info url="http://root.cern.ch/root/"></info>
310		<lib name=Html>
311	<	<use name=ROOT>
311	>	<use name=RootHistMatrix>
312		</Tool>
313		EOF_TOOLFILE
314
#	Line 278 \| Line 317 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
317		<doc type=BuildSystem::ToolDoc version=1.0>
318		<Tool name=rootroofit version=%v>
319		<info url="http://root.cern.ch/root/"></info>
281	–	<lib name=RooFitCore>
320		<lib name=RooFit>
321	+	<lib name=RooFitCore>
322		<use name=ROOTMinuit>
323		<use name=ROOTHtml>
324		</Tool>
#	Line 291 \| Line 330 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
330		<Tool name=rootmlp version=%v>
331		<info url="http://root.cern.ch/root/"></info>
332		<lib name=MLP>
333	<	<use name=ROOT>
333	>	<use name=RootGraphics>
334		</Tool>
335		EOF_TOOLFILE
336
#	Line 310 \| Line 349 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
349		<doc type=BuildSystem::ToolDoc version=1.0>
350		<Tool name=rootthread version=%v>
351		<info url="http://root.cern.ch/root/"></info>
313	–	<lib name=Thread>
352		<use name=ROOTCore>
353		</Tool>
354		EOF_TOOLFILE

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.130 by elmer, Tue Jan 13 19:44:39 2009 UTC vs. Revision 1.157 by dlange, Tue May 5 03:19:51 2009 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.130 by elmer, Tue Jan 13 19:44:39 2009 UTC vs.
Revision 1.157 by dlange, Tue May 5 03:19:51 2009 UTC