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.23 by eulisse, Mon Oct 11 09:13:57 2010 UTC vs.
Revision 1.26 by davidlt, Thu Mar 1 13:39:08 2012 UTC

# Line 9 | Line 9 | Requires: oracle-env
9   %define compilertools %{nil}
10   %endif
11  
12 < %define systemtools                     sockets opengl x11 %compilertools
13 < %define sockets_version                 1.0
14 < %define opengl_version                  XFree4.2
15 < %define x11_version                     R6
12 > %define systemtools                     sockets opengl x11 %compilertools
13 > %define sockets_version                 1.0
14 > %define opengl_version                  XFree4.2
15 > %define x11_version                     R6
16  
17 < ## INITENV SETV SOCKETS_VERSION         %sockets_version
18 < ## INITENV SETV OPENGL_VERSION          %opengl_version
19 < ## INITENV SETV X11_VERSION             %x11_version
20 < ## INITENV SETV PKGTOOLS_SYSTEM_TOOLS   %systemtools
17 > ## INITENV SETV SOCKETS_VERSION         %sockets_version
18 > ## INITENV SETV OPENGL_VERSION          %opengl_version
19 > ## INITENV SETV X11_VERSION             %x11_version
20 > ## INITENV SETV PKGTOOLS_SYSTEM_TOOLS   %systemtools
21  
22   %prep
23   %build
# Line 29 | Line 29 | cat << \EOF_TOOLFILE >%i/etc/scram.d/soc
29    <tool name="sockets" version="%sockets_version">
30   EOF_TOOLFILE
31   case %cmsplatf in
32 < slc3_* | slc4_* | slc4onl_* | slc5_* )
32 > slc4_* | slc4onl_* | slc5_* | slc5onl_* | slc6_* )
33   cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets.xml
34      <lib name="nsl"/>
35      <lib name="crypt"/>
# Line 71 | Line 71 | cat << \EOF_TOOLFILE >%i/etc/scram.d/x11
71    <tool name="x11" version="%x11_version">
72   EOF_TOOLFILE
73   case %cmsplatf in
74 < slc3_*|osx* )
74 > osx* )
75   cat << \EOF_TOOLFILE >>%i/etc/scram.d/x11.xml
76      <client>
77        <environment name="INCLUDE" value="/usr/X11R6/include"/>
78        <environment name="LIBDIR" value="/usr/X11R6/lib"/>
79      </client>
80 +    <runtime name="DYLD_FALLBACK_LIBRARY_PATH" value="$LIBDIR" type="path"/>
81      <lib name="Xt"/>
82      <lib name="Xpm"/>
83      <lib name="X11"/>

Diff Legend

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