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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.127 by elmer, Mon Nov 24 22:17:44 2008 UTC vs.
Revision 1.155 by elmer, Thu Apr 16 21:08:49 2009 UTC

#	Line 1 \| Line 1
1	<	### RPM lcg root 5.21.04
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.18-00-CINTFunctional
10	<	#Patch3: root-5.18-00a-TBufferXML
11	<	#Patch4: root-5.18-00a-Cintex
12	<	#Patch5: root-5.18-00a-Cintex2
13	<	#Patch6: root-5.18-00a-TBufferFile
14	<	#Patch7: root-5.18-00a-cintexquickfix2
15	<	#Patch8: root-5.18-00a-gendict-performance
16	<	#Patch9: root-5.18-00a-TClass-classNameSize
17	<	#Patch10: root-5.18-00a-TFile-stlStreamerInfo
18	<	#Patch11: root-5.18-00-cintex_functional_mmap
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
19		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
20		%define pythonv %(echo $PYTHON_VERSION \| cut -d. -f1,2)
#	Line 23 \| Line 22 \| Patch1: root-5.21-04-CINT-maxlongline
22		Requires: gccxml gsl castor libjpg dcap pcre python
23
24		%if "%cmsplatf" != "slc4onl_ia32_gcc346"
25	<	Requires: qt openssl mysql libpng zlib libungif
25	>	Requires: qt openssl mysql libpng zlib libungif xrootd
26		%else
27		%define skiplibtiff true
28		%endif
#	Line 40 \| Line 39 \| Requires: libtiff
39		%setup -n root
40		%patch0 -p1
41		%patch1 -p1
42	<	#%patch2 -p0
43	<	#%patch3 -p1
44	<	#%patch4 -p0
45	<	#%patch5 -p0
46	<	#%patch6 -p0
47	<	#%patch7 -p0
48	<	#%patch8 -p1
49	<	#%patch9 -p0
50	<	#%patch10 -p0
52	<	#%patch11 -p0
42	>	%patch2 -p1
43	>	%patch3 -p1
44	>	%patch4 -p1
45	>	%patch5 -p1
46	>	%patch6 -p1
47	>	%patch7 -p0
48	>	%patch8 -p0
49	>	%patch9 -p1
50	>	%patch10 -p1
51
52		%build
53		mkdir -p %i
#	Line 66 \| Line 64 \| EXTRA_CONFIG_ARGS="
64		--enable-qt"
65		%else
66		EXTRA_CONFIG_ARGS="
67	+	--with-xrootd=$XROOTD_ROOT
68		--enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
69		--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
70		--with-ssl-incdir=${OPENSSL_ROOT}/include
#	Line 103 \| Line 102 \| CONFIG_ARGS="--with-f77=${GCC_ROOT}
102
103		case $(uname)-$(uname -p) in
104		Linux-x86_64)
105	<	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
105	>	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
106		Linux-i*86)
107		./configure linux $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
108		Darwin*)
#	Line 112 \| Line 111 \| case $(uname)-$(uname -p) in
111		./configure linux $CONFIG_ARGS --disable-rfio;;
112		esac
113
114	<	make %makeprocesses
114	>	case %cmsplatf in
115	>	osx*)
116	>	makeopts=
117	>	;;
118	>	*)
119	>	makeopts="%makeprocesses"
120	>	;;
121	>	esac
122	>
123	>	make $makeopts
124		make cintdlls
125	+
126		%install
127		# Override installers if we are using GNU fileutils cp. On OS X
128		# ROOT's INSTALL is defined to "cp -pPR", which only works with
#	Line 139 \| Line 148 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
148		<doc type=BuildSystem::ToolDoc version=1.0>
149		<Tool name=rootcore version=%v>
150		<info url="http://root.cern.ch/root/"></info>
142	–	<lib name=Cint>
143	–	<lib name=Core>
144	–	<lib name=RIO>
145	–	<lib name=Net>
151		<lib name=Tree>
152	+	<lib name=Net>
153	+	<lib name=Thread>
154	+	<lib name=MathCore>
155	+	<lib name=RIO>
156	+	<lib name=Core>
157	+	<lib name=Cint>
158		<Client>
159		<Environment name=ROOTCORE_BASE default="%i"></Environment>
160		<Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
#	Line 173 \| Line 184 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
184		<doc type=BuildSystem::ToolDoc version=1.0>
185		<Tool name=roothistmatrix version=%v>
186		<info url="http://root.cern.ch/root/"></info>
187	+	<lib name=Gpad>
188	+	<lib name=Graf>
189		<lib name=Hist>
190		<lib name=Matrix>
191		<use name=ROOTCore>
#	Line 195 \| Line 208 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
208		<Tool name=rootgraphics version=%v>
209		<info url="http://root.cern.ch/root/"></info>
210		<lib name=TreePlayer>
198	–	<lib name=Gpad>
211		<lib name=Graf3d>
200	–	<lib name=Graf>
201	–	<lib name=Hist>
202	–	<lib name=Matrix>
203	–	<lib name=Physics>
212		<lib name=Postscript>
213	<	<use name=ROOTCore>
213	>	<use name=ROOTPhysics>
214		</Tool>
215		EOF_TOOLFILE
216
#	Line 217 \| Line 225 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
225		</Tool>
226		EOF_TOOLFILE
227
228	<	# rootinteractive toolfile
228	>	# (temporarily eviscerated) rootinteractive toolfile (GQt/qt lib dependencies
229	>	# have been removed for the moment)
230		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
231		<doc type=BuildSystem::ToolDoc version=1.0>
232		<Tool name=rootinteractive version=%v>
233		<info url="http://root.cern.ch/root/"></info>
234		<lib name=Rint>
235		<lib name=GQt>
236	+	<lib name=Gui>
237		<use name=qt>
238		<use name=libjpg>
239		<use name=libpng>
#	Line 236 \| Line 246 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
246		<doc type=BuildSystem::ToolDoc version=1.0>
247		<Tool name=rootmath version=%v>
248		<info url="http://root.cern.ch/root/"></info>
249	<	<lib name=MathCore>
249	>	<lib name=GenVector>
250		<lib name=MathMore>
251		<use name=ROOTCore>
252		<use name=gsl>
#	Line 288 \| Line 298 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
298		<Tool name=roothtml version=%v>
299		<info url="http://root.cern.ch/root/"></info>
300		<lib name=Html>
301	<	<use name=ROOT>
301	>	<use name=RootHistMatrix>
302		</Tool>
303		EOF_TOOLFILE
304
#	Line 297 \| Line 307 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
307		<doc type=BuildSystem::ToolDoc version=1.0>
308		<Tool name=rootroofit version=%v>
309		<info url="http://root.cern.ch/root/"></info>
300	–	<lib name=RooFitCore>
310		<lib name=RooFit>
311	+	<lib name=RooFitCore>
312		<use name=ROOTMinuit>
313		<use name=ROOTHtml>
314		</Tool>
#	Line 310 \| Line 320 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
320		<Tool name=rootmlp version=%v>
321		<info url="http://root.cern.ch/root/"></info>
322		<lib name=MLP>
323	<	<use name=ROOT>
323	>	<use name=RootGraphics>
324		</Tool>
325		EOF_TOOLFILE
326
#	Line 329 \| Line 339 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
339		<doc type=BuildSystem::ToolDoc version=1.0>
340		<Tool name=rootthread version=%v>
341		<info url="http://root.cern.ch/root/"></info>
332	–	<lib name=Thread>
342		<use name=ROOTCore>
343		</Tool>
344		EOF_TOOLFILE

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.127 by elmer, Mon Nov 24 22:17:44 2008 UTC vs. Revision 1.155 by elmer, Thu Apr 16 21:08:49 2009 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.127 by elmer, Mon Nov 24 22:17:44 2008 UTC vs.
Revision 1.155 by elmer, Thu Apr 16 21:08:49 2009 UTC