ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/systemtools.spec

Comparing COMP/CMSDIST/systemtools.spec (file contents):
Revision 1.7 by ratnik, Mon Nov 5 20:36:04 2007 UTC vs.
Revision 1.9 by elmer, Tue Nov 20 23:12:14 2007 UTC

#	Line 1 | Line 1
1	<	### RPM external systemtools 1.0-onl
1	>	### RPM external systemtools 18
2		Source: none
3
4		%if "%{?use_system_gcc:set}" == "set"
#	Line 7 | Line 7 | Source: none
7		%define compilertools %jcompiler
8		%endif
9
10	<	%if "%{?online_release:set}" == "set"
10	>	%if "%{?online_release:set}" != "set"
11		#%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
12		%define onlinetools zlib curl oracle openssl xerces-c xdaq mimetic
13		# Define variables used in non-scram-managed tools, that would be
#	Line 43 | Line 43 | Source: none
43		%define opengl_version                  XFree4.2
44		%define x11_version                     R6
45		### why oh why is this hardwired??
46	<	%define jcompiler_version               1.5.0.p6-CMS8
46	>	%define jcompiler_version               1.5.0.p6-CMS18
47
48		## INITENV SET SOCKETS_VERSION          %sockets_version
49		## INITENV SET OPENGL_VERSION           %opengl_version
#	Line 145 | Line 145 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/jc
145		</Tool>
146		EOF_TOOLFILE
147
148	<	%if "%{?online_release:set}" == "set"
148	>	%if "%{?online_release:set}" != "set"
149		#cxxcompiler
150		cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
151		<doc type=BuildSystem::ToolDoc version=1.1>
#	Line 357 | Line 357 | EOF_TOOLFILE
357		%{relocateConfig}etc/scram.d/x11
358		%{relocateConfig}etc/scram.d/jcompiler
359
360	<	%if "%{?online_release:set}" == "set"
360	>	%if "%{?online_release:set}" != "set"
361		%{relocateConfig}etc/scram.d/cxxcompiler
362		%{relocateConfig}etc/scram.d/ccompiler
363		%{relocateConfig}etc/scram.d/f77compiler

Diff Legend

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