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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.225 by elmer, Sat Dec 18 07:13:14 2010 UTC vs.
Revision 1.247 by elmer, Wed Feb 23 22:37:57 2011 UTC

#	Line 5 \| Line 5
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	+	%define ismac %(case %cmsplatf in osx%closingbrace echo true;; %closingbrace e
9	+	cho false;; esac)
10
11		Patch0: root-5.27-06-externals
12		Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
#	Line 23 \| Line 25 \| Patch13: root-5.27-06b-r37582-tmva
25		Patch14: root-5.27-06b-r37405
26		Patch15: root-5.27-06b-r37556
27		Patch16: root-5.27-06-fireworks10
28	<
28	>	Patch17: root-5.27-06-TTreeClonerTopLevel
29	>	Patch18: root-5.27-06b-r37947
30	>	Patch19: root-5.27-06b-TTreeCache-r37950-r37919-r37917-r37916-r37906
31	>	Patch20: root-5.27-06b-extra-math-for-roofit-5.28.00
32	>	Patch21: root-5.27-06b-TEfficiency-backport-from-5.28.00
33	>	Patch22: root-5.27-06b-histfactory-bits-from-5.28.00
34	>	Patch23: root-5.27-06b-r37210
35	>	Patch24: root-5.27-06b-r38023
36	>	Patch25: root-5.27-06b-r36708
37	>	Patch26: root-5.27-06b-r38126-r38156
38	>	Patch27: root-5.27-06b-r38198
39	>
40		%define cpu %(echo %cmsplatf \| cut -d_ -f2)
41
42	<	Requires: xrootd gccxml gsl castor libjpg dcap pcre python fftw3
42	>	Requires: gccxml gsl libjpg libpng libtiff libungif pcre python fftw3
43	>
44	>	%if "%ismac" != "true"
45	>	Requires: castor dcap
46	>	%endif
47	>
48		%if "%online" != "true"
49	<	Requires: qt openssl libpng zlib libungif libtiff
49	>	Requires: openssl zlib xrootd
50	>	%endif
51	>
52	>	%if "%ismac" == "true"
53	>	Requires: gfortran-macosx
54	>	%endif
55	>
56	>	%if "%online" != "true"
57	>	%if "%ismac" != "true"
58	>	Requires: qt
59	>	%endif
60		%endif
61
62		%prep
#	Line 50 \| Line 78 \| Requires: qt openssl libpng zlib libungi
78		%patch14 -p1
79		%patch15 -p1
80		%patch16 -p1
81	+	%patch17 -p0
82	+	%patch18 -p1
83	+	%patch19 -p0
84	+	%patch20 -p1
85	+	%patch21 -p1
86	+	%patch22 -p1
87	+	%patch23 -p1
88	+	%patch24 -p1
89	+	%patch25 -p1
90	+	%patch26 -p1
91	+	%patch27 -p1
92
93		# The following patch can only be applied on SLC5 or later (extra linker
94		# options only available with the SLC5 binutils)
#	Line 59 \| Line 98 \| case %cmsplatf in
98		;;
99		esac
100
101	+	# Delete these (irrelevant) files as the fits appear to confuse rpm on OSX
102	+	# (It tries to run install_name_tool on them.)
103	+	rm -fR tutorials/fitsio
104	+
105		%build
106
107		mkdir -p %i
#	Line 104 \| Line 147 \| CONFIG_ARGS="--enable-table
147		--with-dcap-incdir=${DCAP_ROOT}/include
148		--disable-pgsql
149		--disable-mysql
150	<	--disable-xml ${EXTRA_CONFIG_ARGS}"
150	>	--disable-oracle ${EXTRA_CONFIG_ARGS}"
151
152	<	case $(uname)-$(uname -m) in
153	<	Linux-x86_64)
152	>	case %cmsos in
153	>	slc*_amd64)
154		./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 ;;
155	<	Linux-i*86)
155	>	slc*_ia32)
156		./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 ;;
157	<	Darwin*)
157	>	osx*)
158		case %cmsplatf in
159		_ia32_ )
160	<	comparch=i386 ;;
160	>	comparch=i386
161	>	macconfig=macosx
162	>	;;
163		_amd64_ )
164	<	comparch=x86_64 ;;
164	>	comparch=x86_64
165	>	macconfig=macosx64
166	>	;;
167		* )
168	<	comparch=ppc ;;
168	>	comparch=ppc
169	>	macconfig=macosx
170	>	;;
171		esac
172	<	export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
173	<	./configure macosx $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
174	<	Linux-ppc64*)
172	>	export CC=`which gcc` CXX=`which g++`
173	>	./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
174	>	slc_ppc64)
175		./configure linux $CONFIG_ARGS --disable-rfio;;
176		esac
177
178	<	case %cmsplatf in
179	<	osx*)
180	<	makeopts=
132	<	;;
133	<	*)
134	<	makeopts="%makeprocesses"
135	<	;;
136	<	esac
137	<
138	<	make $makeopts
178	>	makeopts="%makeprocesses"
179	>
180	>	make $makeopts
181		make cintdlls
182
183		%install
#	Line 154 \| Line 196 \| export ROOTSYS=%i
196		make INSTALL="$cp" INSTALLDATA="$cp" install
197		mkdir -p $ROOTSYS/lib/python
198		cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
199	+	# This file confuses rpm's find-requires because it starts with
200	+	# a """ and it thinks is the shebang.
201	+	rm -f %i/tutorials/pyroot/mrt.py
202
203		# SCRAM ToolBox toolfile
204		mkdir -p %i/etc/scram.d
#	Line 345 \| Line 390 \| cat << \EOF_TOOLFILE >%i/etc/scram.d/roo
390		</tool>
391		EOF_TOOLFILE
392
393	+	# rootxml toolfile
394	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootxml.xml
395	+	<tool name="rootxml" version="%v">
396	+	<info url="http://root.cern.ch/root/"/>
397	+	<lib name="XMLParser"/>
398	+	<use name="ROOTCore"/>
399	+	</tool>
400	+	EOF_TOOLFILE
401	+
402	+	# rootfoam toolfile
403	+	cat << \EOF_TOOLFILE >%i/etc/scram.d/rootfoam.xml
404	+	<tool name="rootfoam" version="%v">
405	+	<info url="http://root.cern.ch/root/"/>
406	+	<lib name="Foam"/>
407	+	<use name="roothistmatrix"/>
408	+	</tool>
409	+	EOF_TOOLFILE
410	+
411		%post
412		perl -p -i -e "s\|%{instroot}\|$RPM_INSTALL_PREFIX\|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
413

Diff Legend

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

Comparing COMP/CMSDIST/root.spec (file contents): Revision 1.225 by elmer, Sat Dec 18 07:13:14 2010 UTC vs. Revision 1.247 by elmer, Wed Feb 23 22:37:57 2011 UTC

Diff Legend

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.225 by elmer, Sat Dec 18 07:13:14 2010 UTC vs.
Revision 1.247 by elmer, Wed Feb 23 22:37:57 2011 UTC