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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   23-Mar-2008 09:51:25
  Branch: HEAD                             Handle: 2008032308512500

  Modified files:
    openpkg-src/postgresql83
                            postgresql83.spec

  Log:
    link into ODBC also on upgrades

  Summary:
    Revision    Changes     Path
    1.13        +6  -3      openpkg-src/postgresql83/postgresql83.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/postgresql83/postgresql83.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 postgresql83.spec
  --- openpkg-src/postgresql83/postgresql83.spec        18 Mar 2008 17:05:08 
-0000      1.12
  +++ openpkg-src/postgresql83/postgresql83.spec        23 Mar 2008 08:51:25 
-0000      1.13
  @@ -48,7 +48,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_postgresql}
  -Release:      20080318
  +Release:      20080323
   
   #   package options
   %option       with_server       yes
  @@ -709,16 +709,19 @@
             echo "After this the user <user> will be able to connect to his 
RDBMS with:"
             echo "    \$ $RPM_INSTALL_PREFIX/bin/psql"
           ) | %{l_rpmtool} msg -b -t notice
  +    fi
   
  -        #   optionally link into ODBC
   %if "%{with_odbc}" == "yes"
  +    #   optionally link into ODBC
  +    if ! $RPM_INSTALL_PREFIX/bin/odbcinst -q -d -n "PostgreSQL" >/dev/null 
2>&1; then
           ( echo "[PostgreSQL]"
             echo "Description     = PostgreSQL ODBC driver"
             echo "Driver          = $RPM_INSTALL_PREFIX/lib/psqlodbc.so"
             echo "Threading       = 2"
           ) | $RPM_INSTALL_PREFIX/bin/odbcinst -i -d -r -n "PostgreSQL"
  -%endif
       fi
  +%endif
  +
       if [ $1 -eq 2 ]; then
           #   after upgrade, restore status
           { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null 
2>&1
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to