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.3 by ratnik, Wed Aug 6 20:46:22 2008 UTC vs.
Revision 1.5 by muzaffar, Thu Jun 18 16:05:38 2009 UTC

# Line 1 | Line 1
1 < ### RPM external onlinesystemtools 2.1
1 > ### RPM external onlinesystemtools 2.2
2   Source: none
3  
4   # Here we are assuming that online release always uses system compiler:
5   %define compilertools ccompiler cxxcompiler f77compiler jcompiler
6  
7 %if "%cmsplatf" == "slc4onl_ia32_gcc346"
7   #%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
8   %define onlinetools zlib curl oracle openssl xerces-c xdaq mimetic
9   # Define variables used in non-scram-managed tools, that would be
# Line 26 | Line 25 | Source: none
25   %define xerces_version                  2.7.0
26   ## INITENV SET XERCES_C_VERSION         %xerces_version
27   ## INITENV SET XERCES_C_ROOT            /opt/xdaq
28 < %define xdaq_version                    3.16.1
28 > %define xdaq_version                    3.24.0
29   ## INITENV SET XDAQ_VERSION             %xdaq_version
30   ## INITENV SET XDAQ_ROOT                /opt/xdaq
31   %define mimetic_version                 0.9.1
32   ## INITENV SET MIMETIC_VERSION          %mimetic_version
34 %else
35 %define onlinetools %{nil}
36 %endif
33  
34   %define systemtools                     sockets opengl x11 %compilertools %onlinetools
35   %define sockets_version                 1.0
# Line 142 | Line 138 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/jc
138   </Tool>
139   EOF_TOOLFILE
140  
145 %if "%cmsplatf" == "slc4onl_ia32_gcc346"
141   #cxxcompiler
142   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
143   <doc type=BuildSystem::ToolDoc version=1.1>
# Line 358 | Line 353 | cat << \EOF_TOOLFILE >%i/etc/scram.d/mim
353   </Tool>
354   EOF_TOOLFILE
355  
361 %endif
362
356   %post
357   %{relocateConfig}etc/scram.d/sockets
358   %{relocateConfig}etc/scram.d/opengl
359   %{relocateConfig}etc/scram.d/x11
360   %{relocateConfig}etc/scram.d/jcompiler
368
369 %if "%cmsplatf" == "slc4onl_ia32_gcc346"
361   %{relocateConfig}etc/scram.d/cxxcompiler
362   %{relocateConfig}etc/scram.d/ccompiler
363   %{relocateConfig}etc/scram.d/f77compiler
# Line 379 | Line 370 | EOF_TOOLFILE
370   %{relocateConfig}etc/scram.d/xdaqheader
371   %{relocateConfig}etc/scram.d/mimetic
372  
382 %endif
383

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines