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.5 by muzaffar, Thu Jun 18 16:05:38 2009 UTC

# Line 1 | Line 1
1 < ### RPM external onlinesystemtools 2.0
1 > ### RPM external onlinesystemtools 2.2
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  
10 – %if "%{?online_release:set}" == "set"
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 29 | 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.15.0
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
37 – %else
38 – %define onlinetools %{nil}
39 – %endif
33  
34   %define systemtools                     sockets opengl x11 %compilertools %onlinetools
35   %define sockets_version                 1.0
# Line 145 | Line 138 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/jc
138   </Tool>
139   EOF_TOOLFILE
140  
148 – %if "%{?online_release:set}" == "set"
141   #cxxcompiler
142   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
143   <doc type=BuildSystem::ToolDoc version=1.1>
# Line 336 | Line 328 | cat << \EOF_TOOLFILE >%i/etc/scram.d/xda
328   </Tool>
329   EOF_TOOLFILE
330  
331 + #xdaqheader
332 + cat << \EOF_TOOLFILE >%i/etc/scram.d/xdaqheader
333 + <doc type=BuildSystem::ToolDoc version=1.0>
334 + <Tool name=XDAQHEADER version=%xdaq_version>
335 + <info url=http://home.cern.ch/xdaq></info>
336 + <Client>
337 + <Environment name=XDAQHEADER_BASE  default="/opt/xdaq"></Environment>
338 + <Environment name=INCLUDE default="$XDAQHEADER_BASE/include"></Environment>
339 + </Client>
340 + </Tool>
341 + EOF_TOOLFILE
342 +
343   #mimetic
344   cat << \EOF_TOOLFILE >%i/etc/scram.d/mimetic
345   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 349 | Line 353 | cat << \EOF_TOOLFILE >%i/etc/scram.d/mim
353   </Tool>
354   EOF_TOOLFILE
355  
352 – %endif
353 –
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
359 –
360 – %if "%{?online_release:set}" == "set"
361   %{relocateConfig}etc/scram.d/cxxcompiler
362   %{relocateConfig}etc/scram.d/ccompiler
363   %{relocateConfig}etc/scram.d/f77compiler
# Line 367 | Line 367 | EOF_TOOLFILE
367   %{relocateConfig}etc/scram.d/openssl
368   %{relocateConfig}etc/scram.d/xerces-c
369   %{relocateConfig}etc/scram.d/xdaq
370 + %{relocateConfig}etc/scram.d/xdaqheader
371   %{relocateConfig}etc/scram.d/mimetic
372  
372 – %endif
373 –

Diff Legend

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