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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.208 by elmer, Wed Sep 1 14:35:28 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.22.00d
1	>	### RPM lcg root 5.27.06b
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
#	Line 6 \| Line 6 \| Source: ftp://root.cern.ch/%n/%{n}_v%{re
6		%define closingbrace )
7		%define online %(case %cmsplatf in onl__%closingbrace echo true;; %closingbrace echo false;; esac)
8
9	<	Patch0: root-5.22-00d-externals
10	<	Patch1: root-5.22-00d-CINT-maxlongline-maxtypedef
11	<	Patch2: root-5.22-00-TMVA-shut-the-hell-up-for-once
12	<	Patch3: root-5.22-00a-TMVA-shut-the-hell-up-again
13	<	Patch4: root-5.22-00d-fireworks-graf3d-gui
14	<	Patch5: root-5.22-00a-roofit-silence-static-printout
15	<	Patch6: root-5.22-00a-TMVA-just-shut-the-hell-up
16	<	Patch7: root-5.22-00a-th1
17	<	Patch8: root-5.22-00d-makelib-ldl
18	<	Patch9: root-5.22-00a-fireworks1
19	<	Patch10: root-5.22-00a-gcc44
20	<	Patch11: root-5.22-00a-fireworks2
21	<	Patch12: root-5.22-00a-fireworks3
22	<	Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
23	<	Patch14: root-5.22-00a-fireworks4
24	<	Patch15: root-5.22-00d-fireworks5
25	<	Patch16: root-5.22-00d-genreflex_python26_popen3
26	<	Patch17: root-5.22-00d-fireworks6
27	<	Patch18: root-5.22-00d-linker-gnu-hash-style
28	<	Patch19: root-5.22-00d-TFile-version3-Init
29	<	Patch20: root-5.22-00d-cint-namespace
30	<	Patch21: root-5.22-00d-fireworks7
31	<	Patch22: root-5.22-00d-TMath-Vavilov
32	<	Patch23: root-5.22-00d-TBranchElement-dropped-data-member
33	<	Patch24: root-5.22-00d-fireworks8
34	<	Patch25: root-5.22-00d-fix-python-shebang
35	<	Patch26: root-5.22-00d-RootsysOnMac
36	<	Patch27: root-5.22-00d-TString-Clear
37	<	Patch28: root-5.22-00d-libgfortran-dylib-detection
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 fftw3
42	<
24	>	Requires: xrootd gccxml gsl castor libjpg dcap pcre python fftw3
25		%if "%online" != "true"
26	<	Requires: qt openssl libpng zlib libungif xrootd libtiff
26	>	Requires: qt openssl libpng zlib libungif libtiff
27		%endif
28
29		%prep
#	Line 49 \| Line 31 \| Requires: qt openssl libpng zlib libungi
31		%patch0 -p1
32		%patch1 -p1
33		%patch2 -p1
34	<	%patch3 -p1
34	>	# patch3 is OS version dependent, see below
35		%patch4 -p1
54	–
36		%patch5 -p1
37		%patch6 -p1
38		%patch7 -p1
39		%patch8 -p1
40		%patch9 -p1
60	–
61	–	# patch10 is compiler version dependent, see below
62	–	%patch11 -p1
63	–	%patch12 -p1
64	–	# patch13 is compiler version dependent, see below
65	–
66	–	# work around patch issue...
67	–	rm graf3d/gl/src/gl2ps.c
68	–	%patch14 -p1
69	–	#work around patch issues in patch14(?)
70	–	rm graf3d/eve/inc/TEveLegoOverlay.h.orig
71	–	rm graf3d/eve/src/TEveLegoOverlay.cxx
72	–	rm graf3d/gl/inc/gl2ps.h.orig
73	–	rm graf3d/gl/src/gl2ps.c.orig
74	–	%patch15 -p1
75	–	%patch16 -p1
76	–	%patch17 -p1
77	–	%patch19 -p1
78	–	%patch20 -p1
79	–	%patch21 -p1
80	–	%patch22 -p1
81	–	%patch23 -p1
82	–	%patch24 -p1
83	–	%patch25 -p1
84	–	%patch26 -p1
85	–	%patch27 -p1
86	–	%patch28 -p2
87	–
88	–	case %gccver in
89	–	4.3.*)
90	–	%patch13 -p1
91	–	;;
92	–	4.4.*)
41		%patch10 -p1
42	<	;;
95	<	esac
42	>	%patch11 -p1
43
44	<	# The following patch can only be applied on SLC5 or later (extra linker
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	<	%patch18 -p1
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 112 \| 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
115	–	--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}
120	–	--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 140 \| Line 87 \| CONFIG_ARGS="--enable-table
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 150 \| 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		case %cmsplatf in
106		_ia32_ )
#	Line 196 \| 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
199	–	#
147
148		# SCRAM ToolBox toolfile
149		mkdir -p %i/etc/scram.d
#	Line 236 \| 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 246 \| 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 390 \| 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.208 by elmer, Wed Sep 1 14:35:28 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.208 by elmer, Wed Sep 1 14:35:28 2010 UTC vs.
Revision 1.221 by elmer, Mon Nov 29 13:46:57 2010 UTC