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: 18-Dec-2006 10:23:38
Branch: HEAD Handle: 2006121809233800
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
ODBC support works with both UnixODBC and iODBC so use 'ODBC' in
comments only; add missing driver uninstallation; use a name for
correct referencing
Summary:
Revision Changes Path
1.217 +7 -3 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.216 -r1.217 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 15 Dec 2006 18:40:39 -0000
1.216
+++ openpkg-src/postgresql/postgresql.spec 18 Dec 2006 09:23:38 -0000
1.217
@@ -47,7 +47,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20061215
+Release: 20061218
# package options
%option with_server yes
@@ -692,13 +692,13 @@
echo " \$ psql"
) | %{l_rpmtool} msg -b -t notice
- # optionally link into unixODBC
+ # optionally link into ODBC
%if "%{with_odbc}" == "yes"
( 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
+ ) | $RPM_INSTALL_PREFIX/bin/odbcinst -i -d -r -n "PostgreSQL"
%endif
fi
if [ $1 -eq 2 ]; then
@@ -734,6 +734,10 @@
[ $1 -eq 0 ] || exit 0
%{l_rc} postgresql stop 2>/dev/null
rm -f $RPM_INSTALL_PREFIX/var/postgresql/run/* >/dev/null 2>&1 || true
+ # optionally unlink from ODBC
+%if "%{with_odbc}" == "yes"
+ $RPM_INSTALL_PREFIX/bin/odbcinst -u -d -n "PostgreSQL"
+%endif
exit 0
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
