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.13 by muzaffar, Tue Feb 23 09:22:38 2010 UTC vs.
Revision 1.18 by fwyzard, Wed Jan 12 16:17:11 2011 UTC

# Line 1 | Line 1
1 < ### RPM external onlinesystemtools 2.2
1 > ### RPM external onlinesystemtools 2.3
2   Source: none
3 + Requires: oracle-env
4  
5 < # Here we are assuming that online release always uses system compiler:
5 < %define compilertools jcompiler
6 <
5 > %define compilertools %{nil}
6   %define onlinetools zlib curl openssl xerces-c xdaq xdaqheader mimetic oracle oracleocci
7   # Define variables used in non-scram-managed tools, that would be
8   # normally defined in package's init.sh/csh scrips.
9   # Set all versions as currently found on the system.
10   %define xdaq_root                       /opt/xdaq
11 < %define curl_version                    7.12.1
12 < ## INITENV SET CURL_VERSION             %curl_version
13 < %define zlib_version                    1.2.1.2
14 < ## INITENV SET ZLIB_VERSION             %zlib_version
15 < %define oracle_version                  10.2.1
16 < ## INITENV SET ORACLE_VERSION           %oracle_version
17 < ## INITENV SET ORACLE_ROOT              %xdaq_root
18 < %define openssl_version                 0.9.7e
19 < ## INITENV SET OPENSSL_VERSION          %openssl_version
20 < %define xerces_version                  2.7.0
21 < ## INITENV SET XERCES_C_VERSION         %xerces_version
22 < ## INITENV SET XERCES_C_ROOT            %xdaq_root
23 < %define xdaq_version                    3.32.1
24 < ## INITENV SET XDAQ_VERSION             %xdaq_version
25 < ## INITENV SET XDAQ_ROOT                %xdaq_root
11 > %define curl_version                    7.15.5
12 > ## INITENV SETV CURL_VERSION             %curl_version
13 > %define zlib_version                    1.2.3
14 > ## INITENV SETV ZLIB_VERSION             %zlib_version
15 > %define oracle_version                  11.2.2
16 > ## INITENV SETV ORACLE_VERSION           %oracle_version
17 > ## INITENV SETV ORACLE_ROOT             %xdaq_root
18 > %define openssl_version                 0.9.8e
19 > ## INITENV SETV OPENSSL_VERSION          %openssl_version
20 > %define xerces_version                  2.8.0
21 > ## INITENV SETV XERCES_C_VERSION         %xerces_version
22 > ## INITENV SETV XERCES_C_ROOT           %xdaq_root
23 > %define xdaq_version                    3.33.1
24 > ## INITENV SETV XDAQ_VERSION            %xdaq_version
25 > ## INITENV SETV XDAQ_ROOT               %xdaq_root
26   %define mimetic_version                 0.9.1
27 < ## INITENV SET MIMETIC_VERSION          %mimetic_version
27 > ## INITENV SETV MIMETIC_VERSION                 %mimetic_version
28  
29   %define systemtools                     sockets opengl x11 %compilertools %onlinetools
30   %define sockets_version                 1.0
31   %define opengl_version                  XFree4.2
32   %define x11_version                     R6
34 ### why oh why is this hardwired??
35 %define jcompiler_version               1.5.0.p6-CMS8
33  
34 < ## INITENV SET SOCKETS_VERSION          %sockets_version
35 < ## INITENV SET OPENGL_VERSION           %opengl_version
36 < ## INITENV SET X11_VERSION              %x11_version
37 < ## INITENV SET JCOMPILER_VERSION        %jcompiler_version
41 < ## INITENV SET JCOMPILER_TOOL           java-jdk
42 < ## INITENV SET PKGTOOLS_SYSTEM_TOOLS    %systemtools
34 > ## INITENV SETV SOCKETS_VERSION         %sockets_version
35 > ## INITENV SETV OPENGL_VERSION          %opengl_version
36 > ## INITENV SETV X11_VERSION             %x11_version
37 > ## INITENV SETV PKGTOOLS_SYSTEM_TOOLS   %systemtools
38  
39   %prep
40   %build
# Line 113 | Line 108 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/x1
108    </tool>
109   EOF_TOOLFILE
110  
116 # JCompiler
117 %define compiler_ver        %(echo %jcompiler_version | sed -e "s|\\.||g")
118 cat << \EOF_TOOLFILE >>%i/etc/scram.d/jcompiler.xml
119  <tool name="jcompiler" version="%jcompiler_version" type="compiler">
120    <client>
121      <environment name="JAVA_BASE"/>
122      <environment name="JAVAC" value="$JAVA_BASE/bin/javac"/>
123    </client>
124    <flags javac_="$(JAVAC)"/>
125    <flags javac_o="$(JAVAC) -O"/>
126    <flags javac_d="$(JAVAC) -g"/>
127    <flags scram_compiler_name="jsdk%compiler_ver"/>
128    <flags scram_language_type="JAVA"/>
129    <runtime name="JAVA_HOME" default="$JAVA_BASE"/>
130  </tool>
131 EOF_TOOLFILE
132
111   # curl
112   cat << \EOF_TOOLFILE >%i/etc/scram.d/curl.xml
113    <tool name="Curl" version="%curl_version">
# Line 250 | Line 228 | cat << \EOF_TOOLFILE >%i/etc/scram.d/ora
228      <lib name="nnz11"/>
229      <client>
230        <environment name="ORACLE_BASE" default="%xdaq_root"/>
231 <      <environment name="ORACLE_ADMINDIR"/>
231 >      <environment name="ORACLE_ADMINDIR" default="@ORACLE_ENV_ROOT@/etc"/>
232        <environment name="LIBDIR" value="$ORACLE_BASE/lib"/>
233        <environment name="BINDIR" value="$ORACLE_BASE/bin"/>
234        <environment name="INCLUDE" value="$ORACLE_BASE/include"/>
# Line 268 | Line 246 | cat << \EOF_TOOLFILE >%i/etc/scram.d/ora
246    </tool>
247   EOF_TOOLFILE
248  
249 + export ORACLE_ENV_ROOT
250 + perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
251 +
252   %post
253 < cd $RPM_INSTALL_PREFIX/%pkgrel
273 < perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)
253 > %{relocateConfig}/etc/scram.d/*.xml

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines