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:33:49
  Branch: HEAD                             Handle: 2008032308334300

  Modified files:
    openpkg-src/sqlite      sqlite.spec

  Log:
    link into ODBC also on upgrades and do not configure an additional
    ODBC data-source as this is useless without a particular 'Database'
    (filename)

  Summary:
    Revision    Changes     Path
    1.176       +4  -8      openpkg-src/sqlite/sqlite.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sqlite/sqlite.spec
  ============================================================================
  $ cvs diff -u -r1.175 -r1.176 sqlite.spec
  --- openpkg-src/sqlite/sqlite.spec    18 Mar 2008 20:53:35 -0000      1.175
  +++ openpkg-src/sqlite/sqlite.spec    23 Mar 2008 08:33:43 -0000      1.176
  @@ -37,7 +37,7 @@
   Group:        Database
   License:      PD
   Version:      %{V_sqlite}
  -Release:      20080318
  +Release:      20080323
   
   #   package options
   %option       with_assert          no
  @@ -253,27 +253,23 @@
       rm -rf $RPM_BUILD_ROOT
   
   %post
  -    if [ $1 -eq 1 ]; then : ;
  -        #   optionally link into ODBC
  +    #   optionally link into ODBC
   %if "%{with_odbc}" == "yes"
  +    if ! $RPM_INSTALL_PREFIX/bin/odbcinst -q -d -n "SQLite3" >/dev/null 
2>&1; then
           ( echo "[SQLite3]"
             echo "Description     = SQLite 3 ODBC Driver"
             echo "Driver          = $RPM_INSTALL_PREFIX/lib/libsqlite3odbc.so"
             echo "Setup           = $RPM_INSTALL_PREFIX/lib/libsqlite3odbc.so"
             echo "FileUsage       = 1"
           ) | $RPM_INSTALL_PREFIX/bin/odbcinst -i -d -n "SQLite3" -r 
>/dev/null 2>&1 || true
  -        ( echo "[SQLite3 DataSource]"
  -          echo "Driver          = SQLite3"
  -        ) | $RPM_INSTALL_PREFIX/bin/odbcinst -i -s -l -n "SQLite3 
DataSource" -r >/dev/null 2>&1 || true
  -%endif
       fi
  +%endif
   
   %preun
       if [ $1 -eq 1 ]; then : ;
           #   optionally unlink from ODBC
   %if "%{with_odbc}" == "yes"
           $RPM_INSTALL_PREFIX/bin/odbcinst -u -s -l -n "SQLite3 DataSource" 
>/dev/null 2>&1 || true
  -        $RPM_INSTALL_PREFIX/bin/odbcinst -u -d    -n "SQLite3"            
>/dev/null 2>&1 || true
   %endif
       fi
   
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to