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.8 by elmer, Tue Nov 13 14:16:42 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 9 | Line 9 | Source: none
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
12 > %define onlinetools zlib curl oracle 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.
# Line 24 | Line 24 | Source: none
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
27   %define openssl_version                 0.9.7a
28   ## INITENV SET OPENSSL_VERSION          %openssl_version
29   %define xerces_version                  2.7.0
# Line 45 | 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 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 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