rpms/postgresql-odbc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild for unixODBC 2.2.14

Browse Source
This commit is contained in:
Tom Lane 2009-02-20 18:02:53 +00:00
parent e4902d5e24
commit 6ffb083569
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
64bit-fixes.patch Normal file
View File

@ -0,0 +1,59 @@
Miscellaneous changes to align psqlodbc with unixODBC 64-bit fixes.
diff -Naur psqlodbc-08.03.0200.orig/odbcapi30.c psqlodbc-08.03.0200/odbcapi30.c
--- psqlodbc-08.03.0200.orig/odbcapi30.c 2006-11-14 10:29:25.000000000 -0500
+++ psqlodbc-08.03.0200/odbcapi30.c 2009-02-16 13:05:58.000000000 -0500
@@ -118,13 +118,7 @@
SQLPOINTER CharacterAttribute,
SQLSMALLINT BufferLength,
SQLSMALLINT *StringLength,
-#if defined(_WIN64)
SQLLEN *NumericAttribute
-#elif defined(WITH_UNIXODBC) || defined(WIN32)
- SQLPOINTER NumericAttribute
-#else
- SQLLEN *NumericAttribute
-#endif
)
{
CSTR func = "SQLColAttribute";
diff -Naur psqlodbc-08.03.0200.orig/odbcapi30w.c psqlodbc-08.03.0200/odbcapi30w.c
--- psqlodbc-08.03.0200.orig/odbcapi30w.c 2007-04-03 10:49:02.000000000 -0400
+++ psqlodbc-08.03.0200/odbcapi30w.c 2009-02-16 13:08:05.000000000 -0500
@@ -255,11 +255,7 @@
SQLPOINTER pCharAttr,
SQLSMALLINT cbCharAttrMax,
SQLSMALLINT *pcbCharAttr,
-#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
- SQLPOINTER pNumAttr
-#else
SQLLEN *pNumAttr
-#endif
)
{
CSTR func = "SQLColAttributeW";
diff -Naur psqlodbc-08.03.0200.orig/psqlodbc.h psqlodbc-08.03.0200/psqlodbc.h
--- psqlodbc-08.03.0200.orig/psqlodbc.h 2008-05-03 01:57:42.000000000 -0400
+++ psqlodbc-08.03.0200/psqlodbc.h 2009-02-16 13:02:22.000000000 -0500
@@ -235,9 +235,6 @@
#else
#define DRIVER_FILE_NAME "PSQLODBC25.DLL"
#endif /* ODBCVER 0x0300 */
-BOOL isMsAccess();
-BOOL isMsQuery();
-BOOL isSqlServr();
#else
#ifdef UNICODE_SUPPORT
#define DRIVER_FILE_NAME "psqlodbcw.so"
@@ -246,6 +243,10 @@
#endif
#endif /* WIN32 */
+BOOL isMsAccess();
+BOOL isMsQuery();
+BOOL isSqlServr();
+
#define NULL_CATALOG_NAME ""
/* ESCAPEs */

9
postgresql-odbc.spec
View File

@ -1,7 +1,7 @@
Name: postgresql-odbc
Summary: PostgreSQL ODBC driver
Version: 08.03.0200
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Databases
URL: http://psqlodbc.projects.postgresql.org/
@ -16,6 +16,8 @@ Source0: http://www.postgresql.org/ftp/odbc/versions/src/psqlodbc-%{version}.tar
# then strip aclocal.m4 down to just the PGAC macros.
Source1: acinclude.m4
Patch1: 64bit-fixes.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: unixODBC-devel
BuildRequires: libtool automake autoconf postgresql-devel
@ -33,6 +35,8 @@ PostgreSQL system via ODBC (Open Database Connectivity).
%prep
%setup -q -n psqlodbc-%{version}
%patch1 -p1
# Some missing macros. Courtesy Owen Taylor <otaylor@redhat.com>.
cp -p %{SOURCE1} .
@ -77,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%doc license.txt readme.txt docs/*
%changelog
* Fri Feb 20 2009 Tom Lane <tgl@redhat.com> 08.03.0200-2
- Rebuild for unixODBC 2.2.14.
* Tue Aug 5 2008 Tom Lane <tgl@redhat.com> 08.03.0200-1
- Update to version 08.03.0200