ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/onlinesystemtools.spec
(Generate patch)

Comparing COMP/CMSDIST/onlinesystemtools.spec (file contents):
Revision 1.1 by ratnik, Wed Nov 21 23:13:29 2007 UTC vs.
Revision 1.2 by ratnik, Tue May 13 17:10:36 2008 UTC

# Line 1 | Line 1
1   ### RPM external onlinesystemtools 2.0
2   Source: none
3  
4 < %if "%{?use_system_gcc:set}" == "set"
4 > # Here we are assuming that online release always uses system compiler:
5   %define compilertools ccompiler cxxcompiler f77compiler jcompiler
6 %else
7 %define compilertools %jcompiler
8 %endif
6  
7 < %if "%{?online_release:set}" == "set"
7 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
8   #%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
9   %define onlinetools zlib curl oracle openssl xerces-c xdaq mimetic
10   # Define variables used in non-scram-managed tools, that would be
# Line 145 | Line 142 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/jc
142   </Tool>
143   EOF_TOOLFILE
144  
145 < %if "%{?online_release:set}" == "set"
145 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
146   #cxxcompiler
147   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
148   <doc type=BuildSystem::ToolDoc version=1.1>
# Line 357 | Line 354 | EOF_TOOLFILE
354   %{relocateConfig}etc/scram.d/x11
355   %{relocateConfig}etc/scram.d/jcompiler
356  
357 < %if "%{?online_release:set}" == "set"
357 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
358   %{relocateConfig}etc/scram.d/cxxcompiler
359   %{relocateConfig}etc/scram.d/ccompiler
360   %{relocateConfig}etc/scram.d/f77compiler

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines