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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.73 by dlange, Mon Oct 15 12:31:04 2007 UTC vs.
Revision 1.117 by ratnik, Tue May 13 17:18:11 2008 UTC

#	Line 1 \| Line 1
1	<	### RPM lcg root 5.14.00g-CMS11
1	>	### RPM lcg root 5.18.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
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	<	Patch: root-CINT-maxlongline
8	<	Patch1: root_libpng
9	<	Patch2: root_PositionVector
10	<	Patch3: root-fastmerge-ttree
11	<	Patch4: root_TXMLSetup
12	<	Patch5: root-Cintex
13	<	Patch6: root_Reflex_Cintex
14	<	Patch7: root_CallFunc
15	<	Patch8: root-proofd
7	>	Patch0: root-5.18-00-libpng
8	>	Patch1: root-5.18-00a-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
16		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
17		%define pythonv %(echo $PYTHON_VERSION \| cut -d. -f1,2)
19	–	Requires: gccxml python qt gsl castor openssl mysql libpng libjpg dcap pcre zlib oracle libungif xrootd
18
19	<	%if "%cpu" != "amd64"
19	>	Requires: gccxml gsl castor libjpg dcap pcre python
20	>
21	>	%if "%cmsplatf" != "slc4onl_ia32_gcc346"
22	>	Requires: qt openssl mysql libpng zlib libungif xrootd
23	>	%else
24	>	%define skiplibtiff true
25	>	%endif
26	>
27	>	%if "%cpu" == "amd64"
28	>	%define skiplibtiff true
29	>	%endif
30	>
31	>	%if "%skiplibtiff" != "true"
32		Requires: libtiff
33		%endif
34
35		%prep
36		%setup -n root
37	<	%patch -p0
38	<	%patch1 -p2
39	<	%patch2 -p2
37	>	%patch0 -p1
38	>	%patch1 -p1
39	>	%patch2 -p0
40		%patch3 -p1
41		%patch4 -p0
42	<	%patch5 -p1
42	>	%patch5 -p0
43		%patch6 -p0
44		%patch7 -p0
35	–	%patch8 -p1
45
46		%build
47		mkdir -p %i
48		export ROOTSYS=%_builddir/root
49	+
50	+	%if "%cmsplatf" == "slc4onl_ia32_gcc346"
51	+	# Build without mysql, and use system qt.
52	+	# Also skip xrootd and odbc for online case:
53	+
54	+	EXTRA_CONFIG_ARGS="
55	+	--disable-mysql
56	+	--disable-xrootd
57	+	--disable-odbc
58	+	--enable-qt"
59	+	%else
60	+	EXTRA_CONFIG_ARGS="
61	+	--with-xrootd=$XROOTD_ROOT
62	+	--enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
63	+	--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
64	+	--with-ssl-incdir=${OPENSSL_ROOT}/include
65	+	--with-ssl-libdir=${OPENSSL_ROOT}/lib"
66	+	%endif
67	+
68		CONFIG_ARGS="--enable-table
69		--disable-builtin-pcre
70		--disable-builtin-freetype
71		--disable-builtin-zlib
72		--with-gccxml=${GCCXML_ROOT}
73		--enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
46	–	--enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
74		--enable-explicitlink
75		--enable-qtgsi
49	–	--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
76		--enable-mathcore
77		--enable-mathmore
78		--enable-reflex
#	Line 55 \| Line 81 \| CONFIG_ARGS="--enable-table
81		--enable-roofit
82		--disable-ldap
83		--disable-krb5
58	–	--with-ssl-incdir=${OPENSSL_ROOT}/include
59	–	--with-ssl-libdir=${OPENSSL_ROOT}/lib
84		--with-gsl-incdir=${GSL_ROOT}/include
85		--with-gsl-libdir=${GSL_ROOT}/lib
86		--with-dcap-libdir=${DCAP_ROOT}/lib
87		--with-dcap-incdir=${DCAP_ROOT}/include
64	–	--with-xrootd=$XROOTD_ROOT
88		--disable-pgsql
89	<	--disable-xml"
89	>	--disable-xml ${EXTRA_CONFIG_ARGS}"
90	>
91	>	%if (("%cmsplatf" == "slc4_ia32_gcc412")\|\|("%cmsplatf" == "slc4_ia32_gcc422")\|\|("%cmsplatf" == "slc4_amd64_gcc345"))
92	>	CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
93	>	%endif
94
95		case $(uname)-$(uname -p) in
96		Linux-x86_64)
97	<	./configure linuxx8664gcc $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
97	>	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
98		Linux-i*86)
99	<	./configure linux $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
99	>	./configure linux $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
100		Darwin*)
101		./configure macosx $CONFIG_ARGS --disable-rfio;;
102		Linux-ppc64*)
#	Line 105 \| Line 132 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
132		<info url="http://root.cern.ch/root/"></info>
133		<lib name=Cint>
134		<lib name=Core>
135	+	<lib name=RIO>
136	+	<lib name=Net>
137		<lib name=Tree>
138		<Client>
139		<Environment name=ROOTCORE_BASE default="%i"></Environment>
#	Line 229 \| Line 258 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
258		<doc type=BuildSystem::ToolDoc version=1.0>
259		<Tool name=rootroofit version=%v>
260		<info url="http://root.cern.ch/root/"></info>
261	+	<lib name=RooFitCore>
262		<lib name=RooFit>
263		<use name=ROOTMinuit>
264		<use name=ROOTHtml>

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.73 by dlange, Mon Oct 15 12:31:04 2007 UTC vs. Revision 1.117 by ratnik, Tue May 13 17:18:11 2008 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.73 by dlange, Mon Oct 15 12:31:04 2007 UTC vs.
Revision 1.117 by ratnik, Tue May 13 17:18:11 2008 UTC