Hello community, here is the log from the commit of package psqlODBC for openSUSE:Factory checked in at 2013-04-23 17:29:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psqlODBC (Old) and /work/SRC/openSUSE:Factory/.psqlODBC.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psqlODBC", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/psqlODBC/psqlODBC.changes 2011-09-23 12:42:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psqlODBC.new/psqlODBC.changes 2013-04-23 17:29:49.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 23 13:09:31 UTC 2013 - [email protected] + +- fix build on openSUSE > 12.3 with new unixODBC + +------------------------------------------------------------------- New: ---- psqlodbc-08.03.0200-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psqlODBC.spec ++++++ --- /var/tmp/diff_new_pack.OMsoJW/_old 2013-04-23 17:29:51.000000000 +0200 +++ /var/tmp/diff_new_pack.OMsoJW/_new 2013-04-23 17:29:51.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package psqlODBC (Version 08.03.0200) +# spec file for package psqlODBC # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: psqlODBC -BuildRequires: openssl-devel postgresql-devel unixODBC-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel Url: http://pgfoundry.org/projects/psqlodbc %define tarname psqlodbc Summary: ODBC Driver for PostgreSQL -Version: 08.03.0200 -Release: 5 License: LGPL-2.1+ Group: Productivity/Databases/Clients +Version: 08.03.0200 +Release: 0 Source0: %tarname-%{version}.tar.bz2 Patch1: psqlODBC-literal.patch +Patch2: psqlodbc-08.03.0200-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/bin/odbcinst -Obsoletes: pg_odbc postgresql-odbc -Provides: pg_odbc postgresql-odbc pg_iface:/usr/lib/pgsql/odbcinst.ini +Obsoletes: pg_odbc +Obsoletes: postgresql-odbc +Provides: pg_iface:/usr/lib/pgsql/odbcinst.ini +Provides: pg_odbc +Provides: postgresql-odbc %description This package contains the ODBC (Open DataBase Connectivity) driver and @@ -53,8 +60,12 @@ %prep %setup -q -n %tarname-%version %patch1 +%if %?suse_version > 1230 +%patch2 +%endif %build +autoreconf -fi # they don't ship configure.in, so we have to patch configure :( sed -i '/LDFLAGS=/s/\$pg_libs//' configure export CFLAGS="%optflags -fno-strict-aliasing -I/usr/include/pgsql" ++++++ psqlodbc-08.03.0200-build.patch ++++++ Index: odbcapi.c =================================================================== --- odbcapi.c.orig +++ odbcapi.c @@ -1106,7 +1106,7 @@ SQLExtendedFetch( SQLUSMALLINT fFetchType, SQLLEN irow, #ifdef WITH_UNIXODBC - SQLROWSETSIZE *pcrow, + SQLULEN *pcrow, #else SQLULEN *pcrow, #endif /* WITH_UNIXODBC */ Index: odbcapi30.c =================================================================== --- odbcapi30.c.orig +++ odbcapi30.c @@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle 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"; Index: odbcapi30w.c =================================================================== --- odbcapi30w.c.orig +++ odbcapi30w.c @@ -255,11 +255,7 @@ SQLRETURN SQL_API SQLColAttributeW( SQLPOINTER pCharAttr, SQLSMALLINT cbCharAttrMax, SQLSMALLINT *pcbCharAttr, -#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64)) - SQLPOINTER pNumAttr -#else SQLLEN *pNumAttr -#endif ) { CSTR func = "SQLColAttributeW"; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
