[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/oracle/ oracle.spec rc.oracle openpkg-web/ ...
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2003-12-31 8:53:18
Message-ID: 20031231085318.595AA2FFC39 () mail ! openpkg ! org
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   31-Dec-2003 09:53:18
  Branch: HEAD                             Handle: 2003123108531601

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

  Log:
    add explicit build flags for convinience reasons

  Summary:
    Revision    Changes     Path
    1.13        +17 -2      openpkg-src/oracle/oracle.spec
    1.9         +6  -0      openpkg-src/oracle/rc.oracle
    1.7924      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/oracle/oracle.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 oracle.spec
  --- openpkg-src/oracle/oracle.spec	18 Dec 2003 22:54:35 -0000	1.12
  +++ openpkg-src/oracle/oracle.spec	31 Dec 2003 08:53:17 -0000	1.13
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [EVAL]
   Group:        Meta
   License:      PD
  -Version:      20031218
  -Release:      20031218
  +Version:      20031231
  +Release:      20031231
   
   #   package options
   %option       with_oracle_owner   none
  @@ -219,6 +219,18 @@
           fi
       fi
   
  +    #   determine ORACLE client build flags
  +    l_oracle_cflags="-I$l_oracle_incdir"
  +    l_oracle_incdir_public=`echo $l_oracle_incdir | sed -e 's;/[^/]*$;/public;'`
  +    if [ -d "$l_oracle_incdir_public" ]; then
  +        l_oracle_cflags="$l_oracle_cflags -I$l_oracle_incdir_public"
  +    fi
  +    l_oracle_ldflags="-L$l_oracle_libdir"
  +    l_oracle_libs="-lclntsh"
  +    if [ -f "$l_oracle_libdir/libwtc9.so" ]; then
  +        l_oracle_libs="$l_oracle_libs -lwtc9"
  +    fi
  +
       #   install rc file
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  @@ -228,6 +240,9 @@
           -e "s;@l_oracle_home@;${l_oracle_home};g" \
           -e "s;@l_oracle_incdir@;${l_oracle_incdir};g" \
           -e "s;@l_oracle_libdir@;${l_oracle_libdir};g" \
  +        -e "s;@l_oracle_cflags@;${l_oracle_cflags};g" \
  +        -e "s;@l_oracle_ldflags@;${l_oracle_ldflags};g" \
  +        -e "s;@l_oracle_libs@;${l_oracle_libs};g" \
           %{SOURCE rc.oracle} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/oracle/rc.oracle
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 rc.oracle
  --- openpkg-src/oracle/rc.oracle	2 Sep 2003 11:12:51 -0000	1.8
  +++ openpkg-src/oracle/rc.oracle	31 Dec 2003 08:53:17 -0000	1.9
  @@ -10,6 +10,9 @@
       oracle_home="@l_oracle_home@"
       oracle_incdir="@l_oracle_incdir@"
       oracle_libdir="@l_oracle_libdir@"
  +    oracle_cflags="@l_oracle_cflags@"
  +    oracle_ldflags="@l_oracle_ldflags@"
  +    oracle_libs="@l_oracle_libs@"
   
   %info -o
       echo "Oracle Enable:      ${oracle_enable}"
  @@ -18,6 +21,9 @@
       echo "Oracle Home:        ${oracle_home}"
       echo "Oracle C Includes:  ${oracle_incdir}"
       echo "Oracle C Libraries: ${oracle_libdir}"
  +    echo "Oracle C Flags:     ${oracle_cflags}"
  +    echo "Oracle LD Flags:    ${oracle_ldflags}"
  +    echo "Oracle Libraries:   ${oracle_libs}"
   
   %env
       rcService oracle enable yes || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7923 -r1.7924 news.txt
  --- openpkg-web/news.txt	30 Dec 2003 19:10:42 -0000	1.7923
  +++ openpkg-web/news.txt	31 Dec 2003 08:53:16 -0000	1.7924
  @@ -1,3 +1,4 @@
  +31-Dec-2003: Upgraded package: P<oracle-20031231-20031231>
   30-Dec-2003: Upgraded package: P<rwhoisd-1.5.7.3-20031230>
   30-Dec-2003: Upgraded package: P<perl-dbi-20031230-20031230>
   30-Dec-2003: Upgraded package: P<oracle-barebone-9.2.0.1-20031230>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]