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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.196 by elmer, Tue Apr 13 13:12:24 2010 UTC vs.
Revision 1.221 by elmer, Mon Nov 29 13:46:57 2010 UTC

#	Line 1 \| Line 1
1	<	### RPM lcg root 5.26.00b
1	>	### RPM lcg root 5.27.06b
2		## INITENV +PATH PYTHONPATH %i/lib/python
3	<	## INITENV SET ROOTSYS %i
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		%define closingbrace )
7		%define online %(case %cmsplatf in onl__%closingbrace echo true;; %closingbrace echo false;; esac)
8
9	<	Patch0: root-5.18-00-libpng
10	<	Patch1: root-5.22-00-TMVA-shut-the-hell-up-for-once
11	<	Patch2: root-5.22-00a-roofit-silence-static-printout
12	<	Patch3: root-5.22-00d-linker-gnu-hash-style
13	<	Patch4: root-5.26-00a-CINT-maxlongline
14	<	Patch5: root-5.26-00a-silence-TMVA
15	<	Patch6: root-5.22-00d-TMath-Vavilov
16	<	Patch7: root-5.22-00d-TBranchElement-dropped-data-member
17	<	Patch8: root-5.26-00b-genreflex-version-wildcard
18	<	Patch9: root-5.26.00b-fireworks1
9	>	Patch0: root-5.27-06-externals
10	>	Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
11	>	Patch2: root-5.22-00a-roofit-silence-static-printout
12	>	Patch3: root-5.22-00d-linker-gnu-hash-style
13	>	Patch4: root-5.22-00d-TBranchElement-dropped-data-member
14	>	Patch5: root-5.27-06-fireworks9
15	>	Patch6: root-5.27-06b-gdb-backtrace
16	>	Patch7: root-5.27-06-tmva-DecisionTreeNode
17	>	Patch8: root-5.27-06b-r36567
18	>	Patch9: root-5.27-06b-r36572
19	>	Patch10: root-5.27-06b-r36707
20	>	Patch11: root-5.27-06b-r36594
21
22		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
23
24	<	Requires: gccxml gsl castor libjpg dcap pcre python
23	<
24	>	Requires: xrootd gccxml gsl castor libjpg dcap pcre python fftw3
25		%if "%online" != "true"
26	<	Requires: qt openssl libpng zlib libungif xrootd
26	<	%else
27	<	%define skiplibtiff true
28	<	%endif
29	<
30	<	%if "%cpu" == "amd64"
31	<	%define skiplibtiff true
32	<	%endif
33	<
34	<	%if "%skiplibtiff" != "true"
35	<	Requires: libtiff
26	>	Requires: qt openssl libpng zlib libungif libtiff
27		%endif
28
29		%prep
#	Line 40 \| Line 31 \| Requires: libtiff
31		%patch0 -p1
32		%patch1 -p1
33		%patch2 -p1
34	<	%patch3 -p1
34	>	# patch3 is OS version dependent, see below
35		%patch4 -p1
36		%patch5 -p1
37		%patch6 -p1
38		%patch7 -p1
39		%patch8 -p1
40		%patch9 -p1
41	+	%patch10 -p1
42	+	%patch11 -p1
43	+
44	+	# The following patch can only be applied on SLC5 or later (extra linker
45	+	# options only available with the SLC5 binutils)
46	+	case %cmsplatf in
47	+	slc5_* \| slc5onl_* )
48	+	%patch3 -p1
49	+	;;
50	+	esac
51
52		%build
53
54		mkdir -p %i
55	+	export LIBJPG_ROOT
56		export ROOTSYS=%_builddir/root
57		export PYTHONV=$(echo $PYTHON_VERSION \| cut -f1,2 -d.)
58
#	Line 58 \| Line 60 \| export PYTHONV=$(echo $PYTHON_VERSION \|
60		# Use system qt. Also skip xrootd and odbc for online case:
61
62		EXTRA_CONFIG_ARGS="--with-f77=/usr
61	–	--disable-xrootd
63		--disable-odbc
64	<	--disable-qt --disable-qtgsi"
64	>	--disable-qt --disable-qtgsi --disable-astiff"
65		%else
66	+	export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
67		EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
66	–	--with-xrootd=$XROOTD_ROOT
68		--enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
69		--with-ssl-incdir=${OPENSSL_ROOT}/include
70		--with-ssl-libdir=${OPENSSL_ROOT}/lib
#	Line 81 \| Line 82 \| CONFIG_ARGS="--enable-table
82		--enable-reflex
83		--enable-cintex
84		--enable-minuit2
85	+	--enable-fftw3
86	+	--with-fftw3-incdir=${FFTW3_ROOT}/include
87	+	--with-fftw3-libdir=${FFTW3_ROOT}/lib
88		--disable-ldap
89		--disable-krb5
90	+	--with-xrootd=${XROOTD_ROOT}
91		--with-gsl-incdir=${GSL_ROOT}/include
92		--with-gsl-libdir=${GSL_ROOT}/lib
93		--with-dcap-libdir=${DCAP_ROOT}/lib
#	Line 93 \| Line 98 \| CONFIG_ARGS="--enable-table
98
99		case $(uname)-$(uname -m) in
100		Linux-x86_64)
101	<	./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
101	>	./configure linuxx8664gcc $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
102		Linux-i*86)
103	<	./configure linux $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
103	>	./configure linux $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
104		Darwin*)
105	<	./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
105	>	case %cmsplatf in
106	>	_ia32_ )
107	>	comparch=i386 ;;
108	>	_amd64_ )
109	>	comparch=x86_64 ;;
110	>	* )
111	>	comparch=ppc ;;
112	>	esac
113	>	export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
114	>	./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
115		Linux-ppc64*)
116		./configure linux $CONFIG_ARGS --disable-rfio;;
117		esac
#	Line 130 \| Line 144 \| export ROOTSYS=%i
144		make INSTALL="$cp" INSTALLDATA="$cp" install
145		mkdir -p $ROOTSYS/lib/python
146		cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
133	–	#
147
148		# SCRAM ToolBox toolfile
149		mkdir -p %i/etc/scram.d
#	Line 170 \| Line 183 \| EOF_TOOLFILE
183
184		# roothistmatrix toolfile
185		cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
186	<	<tool name="roothistmatrix" version="%v">
186	>	<tool name="roothistmatrix" version="%v">
187		<info url="http://root.cern.ch/root/"/>
188		<lib name="Hist"/>
189		<lib name="Matrix"/>
#	Line 180 \| Line 193 \| EOF_TOOLFILE
193
194		# rootgpad toolfile
195		cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
196	<	<tool name="rootgpad" version="%v">
196	>	<tool name="rootgpad" version="%v">
197		<info url="http://root.cern.ch/root/"/>
198		<lib name="Gpad"/>
199		<lib name="Graf"/>
#	Line 324 \| Line 337 \| EOF_TOOLFILE
337
338		%post
339		perl -p -i -e "s\|%{instroot}\|$RPM_INSTALL_PREFIX\|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
340	+

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.196 by elmer, Tue Apr 13 13:12:24 2010 UTC vs. Revision 1.221 by elmer, Mon Nov 29 13:46:57 2010 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.196 by elmer, Tue Apr 13 13:12:24 2010 UTC vs.
Revision 1.221 by elmer, Mon Nov 29 13:46:57 2010 UTC