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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   18-Dec-2003 23:54:35
  Branch: HEAD                             Handle: 2003121822543302

  Modified files:
    openpkg-src/oracle      oracle.spec
    openpkg-web             news.txt

  Log:
    support new oracle-barebone package

  Summary:
    Revision    Changes     Path
    1.12        +5  -10     openpkg-src/oracle/oracle.spec
    1.7818      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/oracle/oracle.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 oracle.spec
  --- openpkg-src/oracle/oracle.spec    2 Sep 2003 11:12:51 -0000       1.11
  +++ openpkg-src/oracle/oracle.spec    18 Dec 2003 22:54:35 -0000      1.12
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [EVAL]
   Group:        Meta
   License:      PD
  -Version:      20030902
  -Release:      20030902
  +Version:      20031218
  +Release:      20031218
   
   #   package options
   %option       with_oracle_owner   none
  @@ -88,6 +88,7 @@
       fi
       if [ ".$l_oracle_base" = .none ]; then
           for dir in \
  +            %{l_prefix}/share/oracle-barebone \
               $owner_dir \
               /oracle \
               /home/oracle \
  @@ -102,7 +103,7 @@
               /u03/app/oracle \
               /u04/app/oracle
           do
  -            if [ -d "$dir/product" ]; then
  +            if [ -d $dir ]; then
                   l_oracle_base="$dir"
                   break
               fi
  @@ -120,18 +121,12 @@
              ) | %{l_rpmtool} msg -b -t error
              exit 1
           fi
  -        if [ ! -d "$l_oracle_base/product" ]; then
  -           ( echo "ORACLE_BASE directory \"$l_oracle_base\" does not contain 
\"product\ subdirectory."
  -             echo "Please provide correct path with option with_oracle_base."
  -           ) | %{l_rpmtool} msg -b -t error
  -           exit 1
  -        fi
       fi
   
       #   determine ORACLE home directory ($ORACLE_HOME)
       l_oracle_home="%{with_oracle_home}"
       if [ ".$l_oracle_home" = .none ]; then
  -        for dir in $l_oracle_base/product/[0-9]*; do
  +        for dir in $l_oracle_base/product/[0-9]* $l_oracle_base/product 
$l_oracle_base; do
               if [ -d "$dir/rdbms" ]; then
                   l_oracle_home="$dir"
                   break
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7817 -r1.7818 news.txt
  --- openpkg-web/news.txt      18 Dec 2003 22:50:08 -0000      1.7817
  +++ openpkg-web/news.txt      18 Dec 2003 22:54:33 -0000      1.7818
  @@ -1,3 +1,4 @@
  +18-Dec-2003: Upgraded package: P<oracle-20031218-20031218>
   18-Dec-2003: New package: P<oracle-barebone-9.2.0.1-20031218>
   18-Dec-2003: Upgraded package: P<sleuthkit-1.66-20031218>
   18-Dec-2003: Upgraded package: P<gcc34-3.4s20031217-20031218>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to