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.3 by dlange, Fri Sep 7 14:31:05 2007 UTC vs.
Revision 1.16 by muzaffar, Fri Jun 19 12:50:25 2009 UTC

# Line 1 | Line 1
1 < ### RPM virtual systemtools 1.0
1 > ### RPM external systemtools 19
2   Source: none
3  
4 < %define systemtools                     sockets opengl x11 jcompiler
4 > %if "%{?use_system_gcc:set}" == "set"
5 > %define compilertools ccompiler cxxcompiler f77compiler jcompiler
6 > %else
7 > %define compilertools %jcompiler
8 > %endif
9 >
10 > %define systemtools                     sockets opengl x11 %compilertools
11   %define sockets_version                 1.0
12   %define opengl_version                  XFree4.2
13   %define x11_version                     R6
14   ### why oh why is this hardwired??
15 < %define jcompiler_version               1.5.0.p6-CMS8
15 > %define jcompiler_version               1.5.0.p6-CMS18
16  
17   ## INITENV SET SOCKETS_VERSION          %sockets_version
18   ## INITENV SET OPENGL_VERSION           %opengl_version
# Line 23 | Line 29 | mkdir -p %i/etc/scram.d
29   # Sockets
30   cat << \EOF_TOOLFILE >%i/etc/scram.d/sockets
31   <doc type=BuildSystem::ToolDoc version=1.1>
32 < <Tool name=Sockets version=%sockets_version>
32 > <Tool name=sockets version=%sockets_version>
33   EOF_TOOLFILE
34   case %cmsplatf in
35 < slc3_* | slc4_* )
35 > slc3_* | slc4_* | slc4onl_* | slc5_* )
36   cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets
37   <lib name=nsl>
38   <lib name=crypt>
# Line 44 | Line 50 | echo "</Tool>" >>%i/etc/scram.d/sockets
50   # OpenGL
51   cat << \EOF_TOOLFILE >%i/etc/scram.d/opengl
52   <doc type=BuildSystem::ToolDoc version=1.1>
53 < <Tool name=OpenGL version=%opengl_version>
53 > <Tool name=opengl version=%opengl_version>
54   <use name=X11>
55   <lib name=GL>
56   <lib name=GLU>
# Line 65 | Line 71 | echo "</Tool>" >>%i/etc/scram.d/opengl
71   # X11
72   cat << \EOF_TOOLFILE >%i/etc/scram.d/x11
73   <doc type=BuildSystem::ToolDoc version=1.1>
74 < <Tool name=X11 version=%x11_version>
74 > <Tool name=x11 version=%x11_version>
75   EOF_TOOLFILE
76   case %cmsplatf in
77   slc3_* )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines