OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Apr-2004 10:10:27
  Branch: HEAD                             Handle: 2004041309102700

  Modified files:
    openpkg-src/oracle-barebone
                            oracle-barebone.spec oracle-barebone.txt

  Log:
    relocate share/ to libexec/ because Oracle is platform-dependent

  Summary:
    Revision    Changes     Path
    1.9         +16 -16     openpkg-src/oracle-barebone/oracle-barebone.spec
    1.4         +5  -5      openpkg-src/oracle-barebone/oracle-barebone.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/oracle-barebone/oracle-barebone.spec
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 oracle-barebone.spec
  --- openpkg-src/oracle-barebone/oracle-barebone.spec  5 Feb 2004 22:31:13 -0000      
 1.8
  +++ openpkg-src/oracle-barebone/oracle-barebone.spec  13 Apr 2004 08:10:27 -0000     
 1.9
  @@ -34,7 +34,7 @@
   Group:        Database
   License:      Commercial
   Version:      9.2.0.1
  -Release:      20040205
  +Release:      20040413
   
   #   list of sources
   Source0:      
http://www.oracle.com/::/oracle-barebone-%{version}.ix86-linux.cpio.bz2
  @@ -75,11 +75,11 @@
       #   create installation area
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone
   
       #   unpack barebone distribution
       #   (rpmlint workaround: %{SOURCE2} %{SOURCE3})
  -    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone
  +    ( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone
         case "%{l_platform -t}" in
             i?86*-linux*  ) cpio="%{SOURCE0}" ;;
             sun4*-sunos5* ) cpio="%{SOURCE1}" ;;
  @@ -92,32 +92,32 @@
       #   fake unix.rgs file (some users like DBD::Oracle use it
       #   to figure out the Oracle version number
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/install
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/install
       echo "rdbms %{version}" \
  -        >$RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/install/unix.rgs
  +        >$RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/install/unix.rgs
   
       #   provide SQL*Plus environment
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/oracle-barebone
  -    if [ ! -f 
$RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/sqlnet.ora ]; then
  -        mv  
$RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/samples/sqlnet.ora \
  -            $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/
  +    if [ ! -f 
$RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/sqlnet.ora ]; then
  +        mv  
$RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/samples/sqlnet.ora \
  +            $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/
       fi
  -    if [ ! -f 
$RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/tnsnames.ora ]; then
  -        mv  
$RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/samples/tnsnames.ora \
  -            $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/
  +    if [ ! -f 
$RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/tnsnames.ora ]; then
  +        mv  
$RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/samples/tnsnames.ora \
  +            $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/
       fi
  -    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/samples
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/samples
       %{l_shtool} mkln -s \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/oracle-barebone/network/admin/*.ora \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/oracle-barebone/network/admin/*.ora \
           $RPM_BUILD_ROOT%{l_prefix}/etc/oracle-barebone/
       ( echo "#!/bin/sh"
  -      echo "ORACLE_HOME=\"%{l_prefix}/share/oracle-barebone\""
  +      echo "ORACLE_HOME=\"%{l_prefix}/libexec/oracle-barebone\""
         echo "export ORACLE_HOME"
  -      echo "LD_LIBRARY_PATH=\"%{l_prefix}/share/oracle-barebone/lib:/usr/lib\""
  +      echo "LD_LIBRARY_PATH=\"%{l_prefix}/libexec/oracle-barebone/lib:/usr/lib\""
         echo "export LD_LIBRARY_PATH"
  -      echo "exec %{l_prefix}/share/oracle-barebone/bin/sqlplus \${1+\"[EMAIL 
PROTECTED]"}"
  +      echo "exec %{l_prefix}/libexec/oracle-barebone/bin/sqlplus \${1+\"[EMAIL 
PROTECTED]"}"
       ) >sqlplus
       %{l_shtool} install -c -m 755 \
           sqlplus $RPM_BUILD_ROOT%{l_prefix}/bin/
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/oracle-barebone/oracle-barebone.txt
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 oracle-barebone.txt
  --- openpkg-src/oracle-barebone/oracle-barebone.txt   30 Jan 2004 15:44:53 -0000     
 1.3
  +++ openpkg-src/oracle-barebone/oracle-barebone.txt   13 Apr 2004 08:10:27 -0000     
 1.4
  @@ -99,9 +99,9 @@
       always into OpenPKG instaces under the same filesystem
       prefix, it could be reasonable (to avoid problems with
       the linkage of libraries) that you create a symlink from
  -    <prefix>/share/oracle-barebone to /oracle/OracleHome and then use
  -    <prefix>/share/oracle-barebone instead of /oracle/OracleHome in the
  -    Oracle installer. This way your library dependencies use already the
  -    target paths and you do not have to make sure that the applications
  -    you link against the libraries know about the paths.
  +    <prefix>/libexec/oracle-barebone to /oracle/OracleHome and then
  +    use <prefix>/libexec/oracle-barebone instead of /oracle/OracleHome
  +    in the Oracle installer. This way your library dependencies use
  +    already the target paths and you do not have to make sure that the
  +    applications you link against the libraries know about the paths.
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to