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

Comparing COMP/CMSDIST/systemtools.spec (file contents):
Revision 1.5 by ratnik, Tue Oct 16 05:21:58 2007 UTC vs.
Revision 1.13 by dlange, Mon Feb 18 14:07:51 2008 UTC

# Line 1 | Line 1
1 < ### RPM external systemtools 1.0-onl
1 > ### RPM external systemtools 19
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"
11 < #%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
12 < %define onlinetools zlib curl oracle mysql openssl xerces-c xdaq mimetic
13 < # Define variables used in non-scram-managed tools, that would be
14 < # normally defined in package's init.sh/csh scrips.
15 < # Set all versions as currently found on the system.
16 < %define compiler_version                3.4.6
17 < ## INITENV SET CXXCOMPILER_VERSION      %compiler_version
18 < ## INITENV SET CCOMPILER_VERSION        %compiler_version
19 < ## INITENV SET F77COMPILER_VERSION      %compiler_version
20 < %define curl_version                    7.12.1
21 < ## INITENV SET CURL_VERSION             %curl_version
22 < %define zlib_version                    1.2.1.2
23 < ## INITENV SET ZLIB_VERSION             %zlib_version
24 < %define oracle_version                  10.2.1
25 < ## INITENV SET ORACLE_VERSION           %oracle_version
26 < ## INITENV SET ORACLE_ROOT              /opt/xdaq
27 < %define mysql_version                   4.1.20
28 < ## INITENV SET MYSQL_VERSION            %mysql_version
29 < %define openssl_version                 0.9.7a
30 < ## INITENV SET OPENSSL_VERSION          %openssl_version
31 < %define xerces_version                  2.7.0
32 < ## INITENV SET XERCES_C_VERSION         %xerces_version
33 < ## INITENV SET XERCES_C_ROOT            /opt/xdaq
34 < %define xdaq_version                    3.13.0
35 < ## INITENV SET XDAQ_VERSION             %xdaq_version
36 < ## INITENV SET XDAQ_ROOT                /opt/xdaq
37 < %define mimetic_version                 0.9.1
38 < ## INITENV SET MIMETIC_VERSION          %mimetic_version
39 < %else
10 > #PE%if "%{?online_release:set}" == "set"
11 > #PE#%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
12 > #PE%define onlinetools zlib curl oracle openssl xerces-c xdaq mimetic
13 > #PE# Define variables used in non-scram-managed tools, that would be
14 > #PE# normally defined in package's init.sh/csh scrips.
15 > #PE# Set all versions as currently found on the system.
16 > #PE%define compiler_version                3.4.6
17 > #PE## INITENV SET CXXCOMPILER_VERSION      %compiler_version
18 > #PE## INITENV SET CCOMPILER_VERSION        %compiler_version
19 > #PE## INITENV SET F77COMPILER_VERSION      %compiler_version
20 > #PE%define curl_version                    7.12.1
21 > #PE## INITENV SET CURL_VERSION             %curl_version
22 > #PE%define zlib_version                    1.2.1.2
23 > #PE## INITENV SET ZLIB_VERSION             %zlib_version
24 > #PE%define oracle_version                       10.2.1
25 > #PE## INITENV SET ORACLE_VERSION           %oracle_version
26 > #PE## INITENV SET ORACLE_ROOT           /opt/xdaq
27 > #PE%define openssl_version                      0.9.7a
28 > #PE## INITENV SET OPENSSL_VERSION          %openssl_version
29 > #PE%define xerces_version                       2.7.0
30 > #PE## INITENV SET XERCES_C_VERSION         %xerces_version
31 > #PE## INITENV SET XERCES_C_ROOT         /opt/xdaq
32 > #PE%define xdaq_version                 3.13.0
33 > #PE## INITENV SET XDAQ_VERSION          %xdaq_version
34 > #PE## INITENV SET XDAQ_ROOT             /opt/xdaq
35 > #PE%define mimetic_version                      0.9.1
36 > #PE## INITENV SET MIMETIC_VERSION               %mimetic_version
37 > #PE%else
38   %define onlinetools %{nil}
39 < %endif
39 > #PE%endif
40  
41   %define systemtools                     sockets opengl x11 %compilertools %onlinetools
42   %define sockets_version                 1.0
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 62 | Line 60 | mkdir -p %i/etc/scram.d
60   # Sockets
61   cat << \EOF_TOOLFILE >%i/etc/scram.d/sockets
62   <doc type=BuildSystem::ToolDoc version=1.1>
63 < <Tool name=Sockets version=%sockets_version>
63 > <Tool name=sockets version=%sockets_version>
64   EOF_TOOLFILE
65   case %cmsplatf in
66   slc3_* | slc4_* | slc4onl_* )
# Line 83 | Line 81 | echo "</Tool>" >>%i/etc/scram.d/sockets
81   # OpenGL
82   cat << \EOF_TOOLFILE >%i/etc/scram.d/opengl
83   <doc type=BuildSystem::ToolDoc version=1.1>
84 < <Tool name=OpenGL version=%opengl_version>
84 > <Tool name=opengl version=%opengl_version>
85   <use name=X11>
86   <lib name=GL>
87   <lib name=GLU>
# Line 104 | Line 102 | echo "</Tool>" >>%i/etc/scram.d/opengl
102   # X11
103   cat << \EOF_TOOLFILE >%i/etc/scram.d/x11
104   <doc type=BuildSystem::ToolDoc version=1.1>
105 < <Tool name=X11 version=%x11_version>
105 > <Tool name=x11 version=%x11_version>
106   EOF_TOOLFILE
107   case %cmsplatf in
108   slc3_* )
# Line 218 | Line 216 | EOF_TOOLFILE
216   # curl
217   cat << \EOF_TOOLFILE >%i/etc/scram.d/curl
218   <doc type=BuildSystem::ToolDoc version=1.0>
219 < <Tool name=Curl version=%curl_version>
219 > <Tool name=curl version=%curl_version>
220   <lib name=curl>
221   <client>
222   <Environment name=CURL_BASE default="/usr/"></Environment>
# Line 266 | Line 264 | cat << \EOF_TOOLFILE >%i/etc/scram.d/ora
264   </Tool>
265   EOF_TOOLFILE
266  
269 – #mysql
270 – cat << \EOF_TOOLFILE >%i/etc/scram.d/mysql
271 – <doc type=BuildSystem::ToolDoc version=1.0>
272 – <Tool name=mysql version=%mysql_version>
273 – <Lib name=mysqlclient>
274 – <Client>
275 – <Environment name=MYSQL_BASE default="/usr"></Environment>
276 – <Environment name=LIBDIR default="$MYSQL_BASE/lib/mysql"></Environment>
277 – <Environment name=MYSQL_BINDIR default="$MYSQL_BASE/bin"></Environment>
278 – <Environment name=INCLUDE default="$MYSQL_BASE/include/mysql"></Environment>
279 – </Client>
280 – <Runtime name=PATH value="$MYSQL_BINDIR" type=path>
281 – </Tool>
282 – EOF_TOOLFILE
283 –
267   #openssl
268   cat << \EOF_TOOLFILE >%i/etc/scram.d/openssl
269   <doc type=BuildSystem::ToolDoc version=1.0>
# Line 312 | Line 295 | EOF_TOOLFILE
295   #xdaq
296   cat << \EOF_TOOLFILE >%i/etc/scram.d/xdaq
297   <doc type=BuildSystem::ToolDoc version=1.0>
298 < <Tool name=XDAQ version=%xdaq_version>
298 > <Tool name=xdaq version=%xdaq_version>
299   <info url=http://home.cern.ch/xdaq></info>
300   <lib name=toolbox>
301   <lib name=xdaq>
# Line 381 | Line 364 | EOF_TOOLFILE
364   %{relocateConfig}etc/scram.d/curl
365   %{relocateConfig}etc/scram.d/zlib
366   %{relocateConfig}etc/scram.d/oracle
384 – %{relocateConfig}etc/scram.d/mysql
367   %{relocateConfig}etc/scram.d/openssl
368   %{relocateConfig}etc/scram.d/xerces-c
369   %{relocateConfig}etc/scram.d/xdaq

Diff Legend

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