commit c7e830d3617b179d38909026e90b5c201cc05869adc20f224e95350051dcef1f Author: OBS User unknown Date: Mon Jan 15 23:40:12 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unixODBC?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/README.SuSE b/README.SuSE new file mode 100644 index 0000000..678b198 --- /dev/null +++ b/README.SuSE @@ -0,0 +1,18 @@ +Dear customer, + +there occured some important changes in new version release of unixODBC-2.2.2 +package. The differences are particulary in paths to configuration files +and ODBC drivers, to avoid conflicts with another ODBC managers e.g. libiodbc. +The changes are the following: + +- configuration files odbc.ini and odbcinst.ini moved from /etc to + /etc/unixODBC + +- unixODBC drivers and driver config libraries moved from /usr/lib to + /usr/lib/unixODBC + +If you have any problems with configuration, please refer to the unixODBC +documentation for examples of .ini files. + +Have a lot of fun, +Your SuSE team. diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/unixODBC-2.2.12-ctracing.patch b/unixODBC-2.2.12-ctracing.patch new file mode 100644 index 0000000..0ecbe66 --- /dev/null +++ b/unixODBC-2.2.12-ctracing.patch @@ -0,0 +1,26 @@ +--- odbcinstQ/CTracing.cpp ++++ odbcinstQ/CTracing.cpp +@@ -85,12 +85,12 @@ + + SQLGetPrivateProfileString( "ODBC", "Trace", "No", szTracing, sizeof(szTracing), "odbcinst.ini" ); + if ( szTracing[0] == '1' || toupper( szTracing[0] ) == 'Y' +- || ( toupper( szTracing[0] ) == 'O' && toupper( szForce[0] ) == 'N' )) ++ || ( toupper( szTracing[0] ) == 'O' && toupper( szTracing[1] ) == 'N' )) + pTracing->setChecked( true ); + + SQLGetPrivateProfileString( "ODBC", "ForceTrace", "No", szForce, sizeof(szForce), "odbcinst.ini" ); + if ( szForce[0] == '1' || toupper( szForce[0] ) == 'Y' +- || ( toupper( szForce[0] ) == 'O' && toupper( szForce[0] ) == 'N' )) ++ || ( toupper( szForce[0] ) == 'O' && toupper( szForce[1] ) == 'N' )) + pForce->setChecked( true ); + + SQLGetPrivateProfileString( "ODBC", "TraceFile", "/tmp/sql.log", szTracingFile, sizeof(szTracingFile)-1, "odbcinst.ini" ); +@@ -98,7 +98,7 @@ + + SQLGetPrivateProfileString( "ODBC", "Pooling", "No", szPooling, sizeof(szPooling), "odbcinst.ini" ); + if ( szPooling[0] == '1' || toupper( szPooling[0] ) == 'Y' +- || ( toupper( szPooling[0] ) == 'O' && toupper( szForce[0] ) == 'N' )) ++ || ( toupper( szPooling[0] ) == 'O' && toupper( szPooling[1] ) == 'N' )) + pPooling->setChecked( true ); + + connect( pSetDefault, SIGNAL(clicked()), SLOT(setDefault()) ); diff --git a/unixODBC-2.2.12-dlopen.patch b/unixODBC-2.2.12-dlopen.patch new file mode 100644 index 0000000..d83562b --- /dev/null +++ b/unixODBC-2.2.12-dlopen.patch @@ -0,0 +1,11 @@ +--- libltdl/ltdl.c ++++ libltdl/ltdl.c +@@ -1107,7 +1107,7 @@ + lt_user_data loader_data; + const char *filename; + { +- lt_module module = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW); ++ lt_module module = dlopen (filename, LT_LAZY_OR_NOW); + + if (!module) + { diff --git a/unixODBC-2.2.12-dm.patch b/unixODBC-2.2.12-dm.patch new file mode 100644 index 0000000..2de9499 --- /dev/null +++ b/unixODBC-2.2.12-dm.patch @@ -0,0 +1,43 @@ +diff -ur unixODBC-orig/DataManager/Makefile.am unixODBC-2.2.11/DataManager/Makefile.am +--- unixODBC-orig/DataManager/Makefile.am 2004-09-13 16:46:11.000000000 +0200 ++++ unixODBC-2.2.11/DataManager/Makefile.am 2005-04-25 16:08:17.000000000 +0200 +@@ -9,10 +9,11 @@ + @USER_LDFLAGS@ \ + @LIB_QT@ \ + ../odbcinst/libodbcinst.la \ ++ ../ini/libinilc.la \ + ../DriverManager/libodbc.la + + DataManager_DEPENDANCIES = \ +- ../odbcinst/libodbcinst.la \ ++ ../odbcinst/libodbcinst.la \ + ../DriverManager/libodbc.la + + DataManager_SOURCES = \ +diff -ur unixODBC-orig/DataManagerII/Makefile.am unixODBC-2.2.11/DataManagerII/Makefile.am +--- unixODBC-orig/DataManagerII/Makefile.am 2004-11-20 13:57:38.000000000 +0100 ++++ unixODBC-2.2.11/DataManagerII/Makefile.am 2005-04-25 17:31:06.000000000 +0200 +@@ -9,10 +9,11 @@ + @USER_LDFLAGS@ \ + @LIB_QT@ \ + ../odbcinst/libodbcinst.la \ ++ ../ini/libinilc.la \ + ../DriverManager/libodbc.la + + DataManagerII_DEPENDANCIES = \ +- ../odbcinst/libodbcinst.la \ ++ ../odbcinst/libodbcinst.la \ + ../DriverManager/libodbc.la + + DataManagerII_SOURCES = \ +diff -ur unixODBC-orig/odbctest/Makefile.am unixODBC-2.2.11/odbctest/Makefile.am +--- unixODBC-orig/odbctest/Makefile.am 2004-09-13 16:47:34.000000000 +0200 ++++ unixODBC-2.2.11/odbctest/Makefile.am 2005-04-25 18:35:38.000000000 +0200 +@@ -10,6 +10,7 @@ + @LIB_QT@ \ + ../odbcinst/libodbcinst.la \ + ../DriverManager/libodbc.la \ ++ ../ini/libinilc.la \ + $(LIBLTDL) $(LIBADD_DL) + + odbctest_DEPENDANCIES = ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la diff --git a/unixODBC-2.2.12-flex.patch b/unixODBC-2.2.12-flex.patch new file mode 100644 index 0000000..66907dc --- /dev/null +++ b/unixODBC-2.2.12-flex.patch @@ -0,0 +1,11 @@ +--- sqp/lex.l ++++ sqp/lex.l +@@ -237,7 +237,7 @@ + { + sprintf( g_szError, "%s processing '%s' on line %d", s, yytext, g_nLineNo ); + +- YY_FLUSH_BUFFER; ++ yy_flush_buffer( YY_CURRENT_BUFFER ); + } + + /********************************************************************** diff --git a/unixODBC-2.2.12-libodbcinst-exports.patch b/unixODBC-2.2.12-libodbcinst-exports.patch new file mode 100644 index 0000000..68a3c57 --- /dev/null +++ b/unixODBC-2.2.12-libodbcinst-exports.patch @@ -0,0 +1,55 @@ +Index: odbcinst/odbcinst.exp +================================================================================ +--- odbcinst/odbcinst.exp ++++ odbcinst/odbcinst.exp +@@ -60,3 +60,50 @@ + _odbcinst_SystemINI + _odbcinst_UserINI + inst_logPushMsg ++iniAllTrim ++iniAppend ++iniClose ++iniCommit ++iniCursor ++iniDelete ++iniElement ++iniElementCount ++iniElementEOL ++iniElementToEnd ++iniGetBookmark ++iniGotoBookmark ++iniObject ++iniObjectDelete ++iniObjectEOL ++iniObjectFirst ++iniObjectInsert ++iniObjectLast ++iniObjectNext ++iniObjectSeek ++iniObjectSeekSure ++iniObjectUpdate ++iniOpen ++iniProperty ++iniPropertyDelete ++iniPropertyEOL ++iniPropertyFirst ++iniPropertyInsert ++iniPropertyLast ++iniPropertyNext ++iniPropertySeek ++iniPropertySeekSure ++iniPropertyUpdate ++iniPropertyValue ++iniToUpper ++iniValue ++_iniObjectRead ++_iniPropertyRead ++__iniDebug ++_iniDump ++_iniScanUntilNextObject ++_iniScanUntilObject ++lt_dlclose ++lt_dlerror ++lt_dlinit ++lt_dlopen ++lt_dlsym diff --git a/unixODBC-2.2.12-sqp.patch b/unixODBC-2.2.12-sqp.patch new file mode 100644 index 0000000..66aff5f --- /dev/null +++ b/unixODBC-2.2.12-sqp.patch @@ -0,0 +1,34 @@ +--- sqp/sqpStoreDataType.c ++++ sqp/sqpStoreDataType.c +@@ -6,9 +6,20 @@ + * + ****************************************/ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "sqp.h" + #include + ++#ifndef WIN32 ++#ifndef HAVE_STRICMP ++#define stricmp(s1,s2) strcasecmp(s1,s2) ++#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) ++#endif ++#endif ++ + void sqpStoreDataType( char *pszType, int nPrecision, int nScale ) + { + HSQPDATATYPE hDataType; +--- sqp/Makefile.am ++++ sqp/Makefile.am +@@ -46,6 +46,8 @@ + + endif + ++AM_YFLAGS = -d ++ + EXTRA_DIST = \ + yac.h + diff --git a/unixODBC-2.2.12-uninitialized.patch b/unixODBC-2.2.12-uninitialized.patch new file mode 100644 index 0000000..00b025c --- /dev/null +++ b/unixODBC-2.2.12-uninitialized.patch @@ -0,0 +1,29 @@ +htbl_stmt hasn't yet been allocated in both cases +--- Drivers/PostgreSQL/info.c ++++ Drivers/PostgreSQL/info.c +@@ -2043,7 +2043,6 @@ + stmt->errormsg = "No Table specified to SQLPrimaryKeys."; + stmt->errornumber = STMT_INTERNAL_ERROR; + SC_log_error(func, "", stmt); +- PG__SQLFreeStmt(htbl_stmt, SQL_DROP); + return SQL_ERROR; + } + +@@ -2228,7 +2227,6 @@ + stmt->errormsg = "Couldn't allocate memory for SQLForeignKeys result."; + stmt->errornumber = STMT_NO_MEMORY_ERROR; + SC_log_error(func, "", stmt); +- PG__SQLFreeStmt(htbl_stmt, SQL_DROP); + return SQL_ERROR; + } + +--- Drivers/PostgreSQL/convert.c ++++ Drivers/PostgreSQL/convert.c +@@ -178,6 +178,7 @@ + + } + ++ memset(&st, 0, sizeof(SIMPLE_TIME)); + mylog("copy_and_convert: field_type = %d, fctype = %d, value = '%s', cbValueMax=%d\n", field_type, fCType, (value==NULL)?"":value, cbValueMax); + + if ( ! value) { diff --git a/unixODBC-2.2.12.tar.bz2 b/unixODBC-2.2.12.tar.bz2 new file mode 100644 index 0000000..a76bc56 --- /dev/null +++ b/unixODBC-2.2.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:813aa3a6d8a92e895fb50f73bc6b17869ae6a435f53bce719048df87c50daefe +size 2158675 diff --git a/unixODBC-gccwarnings.patch b/unixODBC-gccwarnings.patch new file mode 100644 index 0000000..f42bf2e --- /dev/null +++ b/unixODBC-gccwarnings.patch @@ -0,0 +1,103 @@ +--- Drivers/PostgreSQL/info.c ++++ Drivers/PostgreSQL/info.c +@@ -1667,7 +1667,7 @@ + StatementClass *col_stmt, *indx_stmt; + char column_name[MAX_INFO_STRING]; + char **column_names = 0; +-Int4 column_name_len; ++SQLLEN column_name_len; + int total_columns = 0; + char error = TRUE; + ConnInfo *ci; +--- exe/odbc-config.c ++++ exe/odbc-config.c +@@ -22,6 +22,8 @@ + **********************************************************************/ + + #include ++#include ++#include + + static void usage( void ) + { +@@ -169,4 +171,5 @@ + exit( -1 ); + } + } ++ return 0; + } +--- Drivers/nn/nndate.c ++++ Drivers/nn/nndate.c +@@ -15,6 +15,7 @@ + #include + + #include ++#include "misc.h" + + static char* month_name[] = + { "Jan", "Feb", "Mar", "Apr", "May", "Jun", +--- Drivers/nn/misc.h ++++ Drivers/nn/misc.h +@@ -0,0 +1,7 @@ ++#ifndef _MISC_H ++# define _MISC_H ++ ++extern int upper_strneq(char *s1, char *s2, int n); ++ ++ ++#endif +--- Drivers/nn/connect.c ++++ Drivers/nn/connect.c +@@ -13,6 +13,7 @@ + GNU General Public License for more details. + **/ + #include "driver.h" ++#include "misc.h" + + void* nnodbc_getenverrstack(void* henv) + { +--- Drivers/nn/config.h ++++ Drivers/nn/config.h +@@ -21,6 +21,8 @@ + # include + # include + # include ++# include ++# include + + # define MEM_ALLOC(size) (malloc((size_t)(size))) + # define MEM_FREE(ptr) {if(ptr) free(ptr);} +--- Drivers/nn/nntp.c ++++ Drivers/nn/nntp.c +@@ -35,6 +35,7 @@ + #endif + + #include ++#include "misc.h" + + typedef struct { + long article_num; +--- Drivers/nn/nncol.c ++++ Drivers/nn/nncol.c +@@ -17,6 +17,7 @@ + + #include + #include "nncol.ci" ++#include "misc.h" + + int nnsql_getcolidxbyname( char* col_name ) + { +--- Drivers/Postgre7.1/dlg_specific.c ++++ Drivers/Postgre7.1/dlg_specific.c +@@ -21,10 +21,10 @@ + #endif + + #ifndef WIN32 ++# include + # ifdef UNIXODBC + # include + # else +-# include + # include "gpps.h" + # define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) + # define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d) diff --git a/unixODBC-gui-qt.changes b/unixODBC-gui-qt.changes new file mode 100644 index 0000000..f86b2c6 --- /dev/null +++ b/unixODBC-gui-qt.changes @@ -0,0 +1,44 @@ +------------------------------------------------------------------- +Wed Nov 15 16:54:03 CET 2006 - anosek@suse.cz + +- fixed compiler warning: variable is used before its value is set + [#218998] (ctracing.patch) + +------------------------------------------------------------------- +Wed Oct 18 12:02:48 CEST 2006 - anosek@suse.cz + +- updated to version 2.2.12 + * bugfixes + +------------------------------------------------------------------- +Tue Jul 25 13:31:21 CEST 2006 - mmarek@suse.de + +- fix build with modular Xorg + +------------------------------------------------------------------- +Thu Jun 15 15:31:15 CEST 2006 - mmarek@suse.cz + +- moved %{_libdir}/unixODBC/*.so to main package, so that libfoo.so + and libfooS.so can be used in driver configuration. + +------------------------------------------------------------------- +Thu Jun 15 10:06:51 CEST 2006 - mmarek@suse.cz + +- updated distributed libltdl to make autoconf happy +- dropped unixODBC-gui-gtk + +------------------------------------------------------------------- +Thu Jun 8 12:45:16 CEST 2006 - mmarek@suse.cz + +- reduce BuildRequires + +------------------------------------------------------------------- +Wed Jan 25 21:42:27 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Jan 20 01:24:09 CET 2006 - ro@suse.de + +- split specfile for gui packages + diff --git a/unixODBC-gui-qt.spec b/unixODBC-gui-qt.spec new file mode 100644 index 0000000..2c8466e --- /dev/null +++ b/unixODBC-gui-qt.spec @@ -0,0 +1,142 @@ +# +# spec file for package unixODBC-gui-qt (Version 2.2.12) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: unixODBC-gui-qt +BuildRequires: qt3-devel +Version: 2.2.12 +Release: 13 +Summary: ODBC Configuration Utility, Data Source Browser, and ODBC Test Tool based +License: GNU General Public License (GPL) +URL: http://www.unixodbc.org/ +Group: Productivity/Databases/Tools +Requires: unixODBC = %{version} +Autoreqprov: on +Source: unixODBC-%{version}.tar.bz2 +Source1: README.SuSE +Patch1: unixODBC-paths.patch +Patch4: unixODBC-odbctest.patch +Patch5: unixODBC-iaddr.patch +Patch6: unixODBC-nonvoid.patch +Patch7: unixODBC-gccwarnings.patch +Patch8: unixODBC-%{version}-dm.patch +# this is applied in %%build +Patch9: unixODBC-%{version}-dlopen.patch +Patch10: unixODBC-%{version}-libodbcinst-exports.patch +Patch11: unixODBC-%{version}-flex.patch +Patch12: unixODBC-%{version}-ctracing.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +A collection of graphical tools (based on QT3) for UnixODBC. + + + +Authors: +-------- + Peter Harvey + Nick Gorham + +%prep +%setup -q -n unixODBC-%{version} +%patch1 +%patch4 +%patch5 +%patch6 +%patch7 +#patch8 -p1 +# %%patch9 is in %%build +%patch10 +%patch11 +%patch12 +install -m 644 %{S:1} . + +%build +export -n LANG LINGUAS LC_ALL +rm -rf libltdl +LIBTOOLIZE="libtoolize --ltdl" autoreconf --force --install +patch -p0 <"%{P:9}" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +./configure \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --libdir=%{_libdir} \ + --sysconfdir=%{_sysconfdir}/unixODBC \ + --with-qt-dir=/usr/lib/qt3 \ + --with-qt-libraries=/usr/lib/qt3/%{_lib} \ + --x-libraries=`pkg-config --variable libdir x11` \ + --x-includes=`pkg-config --variable includedir x11` \ + --disable-stats + +make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" + +%install +make DESTDIR=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/usr/share/libtool +#remove files packaged in main specfile +rm -f $RPM_BUILD_ROOT/etc/unixODBC/odbc.ini +rm -f $RPM_BUILD_ROOT/etc/unixODBC/odbcinst.ini +rm -f $RPM_BUILD_ROOT/usr/bin/dltest +rm -f $RPM_BUILD_ROOT/usr/bin/isql +rm -f $RPM_BUILD_ROOT/usr/bin/iusql +rm -f $RPM_BUILD_ROOT/usr/bin/odbc_config +rm -f $RPM_BUILD_ROOT/usr/bin/odbcinst +rm -f $RPM_BUILD_ROOT/usr/include/autotest.h +rm -f $RPM_BUILD_ROOT/usr/include/odbcconfig.h +rm -f $RPM_BUILD_ROOT/usr/include/odbcinst.h +rm -f $RPM_BUILD_ROOT/usr/include/odbcinstext.h +rm -f $RPM_BUILD_ROOT/usr/include/sql.h +rm -f $RPM_BUILD_ROOT/usr/include/sqlext.h +rm -f $RPM_BUILD_ROOT/usr/include/sqltypes.h +rm -f $RPM_BUILD_ROOT/usr/include/sqlucode.h +rm -f $RPM_BUILD_ROOT/usr/include/uodbc_stats.h +rm -f $RPM_BUILD_ROOT/usr/%_lib/libboundparam.* +rm -f $RPM_BUILD_ROOT/usr/%_lib/libgtrtst.* +rm -f $RPM_BUILD_ROOT/usr/%_lib/libodbc.* +rm -f $RPM_BUILD_ROOT/usr/%_lib/libodbccr.* +rm -f $RPM_BUILD_ROOT/usr/%_lib/libodbcinst.* +rm -f $RPM_BUILD_ROOT/usr/%_lib/libtemplate.* +rm -rf $RPM_BUILD_ROOT/usr/%_lib/unixODBC + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%files +%defattr(-, root, root) +%{_prefix}/bin/DataManager +%{_prefix}/bin/DataManagerII +%{_prefix}/bin/ODBCConfig +%{_prefix}/bin/qtodbctest +%{_libdir}/libodbcinstQ.* +%exclude /usr/include/uodbc_extras.h + +%changelog -n unixODBC-gui-qt +* Wed Nov 15 2006 - anosek@suse.cz +- fixed compiler warning: variable is used before its value is set + [#218998] (ctracing.patch) +* Wed Oct 18 2006 - anosek@suse.cz +- updated to version 2.2.12 + * bugfixes +* Tue Jul 25 2006 - mmarek@suse.de +- fix build with modular Xorg +* Thu Jun 15 2006 - mmarek@suse.cz +- moved %%{_libdir}/unixODBC/*.so to main package, so that libfoo.so + and libfooS.so can be used in driver configuration. +* Thu Jun 15 2006 - mmarek@suse.cz +- updated distributed libltdl to make autoconf happy +- dropped unixODBC-gui-gtk +* Thu Jun 08 2006 - mmarek@suse.cz +- reduce BuildRequires +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Fri Jan 20 2006 - ro@suse.de +- split specfile for gui packages diff --git a/unixODBC-iaddr.patch b/unixODBC-iaddr.patch new file mode 100644 index 0000000..3330656 --- /dev/null +++ b/unixODBC-iaddr.patch @@ -0,0 +1,44 @@ +--- Drivers/Postgre7.1/socket.c ++++ Drivers/Postgre7.1/socket.c +@@ -100,7 +100,7 @@ + { + struct hostent *host; + struct sockaddr_in sadr; +-unsigned long iaddr; ++struct in_addr iaddr; + + if (self->socket != -1) { + self->errornumber = SOCKET_ALREADY_CONNECTED; +@@ -113,8 +113,8 @@ + /* If it is a valid IP address, use it. + Otherwise use hostname lookup. + */ +- iaddr = inet_addr(hostname); +- if (iaddr == INADDR_NONE) { ++ iaddr.s_addr = inet_addr(hostname); ++ if (iaddr.s_addr == INADDR_NONE) { + host = gethostbyname(hostname); + if (host == NULL) { + self->errornumber = SOCKET_HOST_NOT_FOUND; +--- Drivers/PostgreSQL/socket.c ++++ Drivers/PostgreSQL/socket.c +@@ -102,7 +102,7 @@ + { + struct hostent *host; + struct sockaddr_in sadr; +-unsigned long iaddr; ++struct in_addr iaddr; + + if (self->socket != -1) { + self->errornumber = SOCKET_ALREADY_CONNECTED; +@@ -115,8 +115,8 @@ + /* If it is a valid IP address, use it. + Otherwise use hostname lookup. + */ +- iaddr = inet_addr(hostname); +- if (iaddr == INADDR_NONE) { ++ iaddr.s_addr = inet_addr(hostname); ++ if (iaddr.s_addr == INADDR_NONE) { + host = gethostbyname(hostname); + if (host == NULL) { + self->errornumber = SOCKET_HOST_NOT_FOUND; diff --git a/unixODBC-nonvoid.patch b/unixODBC-nonvoid.patch new file mode 100644 index 0000000..18d5803 --- /dev/null +++ b/unixODBC-nonvoid.patch @@ -0,0 +1,63 @@ +--- DriverManager/SQLAllocHandle.c ++++ DriverManager/SQLAllocHandle.c +@@ -224,6 +224,7 @@ + * + **********************************************************************/ + ++ + #include "drivermanager.h" + #if defined ( COLLECT_STATS ) && defined( HAVE_SYS_SEM_H ) + #include "__stats.h" +--- DriverManager/SQLConnect.c ++++ DriverManager/SQLConnect.c +@@ -764,6 +764,7 @@ + } + + mutex_lib_exit(); ++ return 0; + } + + /* +--- cur/SQLAllocHandle.c ++++ cur/SQLAllocHandle.c +@@ -139,4 +139,5 @@ + } + break; + } ++ return 0; + } +--- cur/SQLEndTran.c ++++ cur/SQLEndTran.c +@@ -70,4 +70,5 @@ + default: + return SQL_ERROR; + } ++ return 0; + } +--- cur/SQLError.c ++++ cur/SQLError.c +@@ -149,4 +149,5 @@ + + return SQL_NO_DATA; + } ++ return 0; + } +--- cur/SQLFreeHandle.c ++++ cur/SQLFreeHandle.c +@@ -102,5 +102,6 @@ + */ + return SQL_ERROR; + } ++ return 0; + } + +--- odbcinst/SQLSetConfigMode.c ++++ odbcinst/SQLSetConfigMode.c +@@ -23,6 +23,7 @@ + __set_config_mode( int mode ) + { + __config_mode = mode; ++ return 0; + } + + __get_config_mode() diff --git a/unixODBC-odbctest.patch b/unixODBC-odbctest.patch new file mode 100644 index 0000000..271ff17 --- /dev/null +++ b/unixODBC-odbctest.patch @@ -0,0 +1,27 @@ +--- odbctest/Makefile.am ++++ odbctest/Makefile.am +@@ -1,10 +1,10 @@ + if QT + +-bin_PROGRAMS = odbctest ++bin_PROGRAMS = qtodbctest + + INCLUDES = -I@top_srcdir@/include $(QT_CXXFLAGS) -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(LTDLINCL) + +-odbctest_LDADD = \ ++qtodbctest_LDADD = \ + $(QT_LDFLAGS) \ + $(QT_LIBS) \ + ../ini/libinilc.la \ +@@ -12,9 +12,9 @@ + ../DriverManager/libodbc.la \ + $(LIBLTDL) $(LIBADD_DL) + +-odbctest_DEPENDANCIES = ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la ++qtodbctest_DEPENDANCIES = ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la + +-odbctest_SOURCES = \ ++qtodbctest_SOURCES = \ + tools.cpp \ + stmt.cpp \ + results.cpp \ diff --git a/unixODBC-paths.patch b/unixODBC-paths.patch new file mode 100644 index 0000000..53784f6 --- /dev/null +++ b/unixODBC-paths.patch @@ -0,0 +1,130 @@ +--- DRVConfig/MiniSQL/Makefile.am ++++ DRVConfig/MiniSQL/Makefile.am +@@ -8,3 +8,4 @@ + + libodbcminiS_la_SOURCES = odbcminiS.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/MySQL/Makefile.am ++++ DRVConfig/MySQL/Makefile.am +@@ -8,3 +8,4 @@ + + libodbcmyS_la_SOURCES = odbcmyS.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/Oracle/Makefile.am ++++ DRVConfig/Oracle/Makefile.am +@@ -8,3 +8,4 @@ + + liboraodbcS_la_SOURCES = oraodbcS.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/PostgreSQL/Makefile.am ++++ DRVConfig/PostgreSQL/Makefile.am +@@ -8,3 +8,4 @@ + + libodbcpsqlS_la_SOURCES = odbcpsqlS.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/drvcfg1/Makefile.am ++++ DRVConfig/drvcfg1/Makefile.am +@@ -8,3 +8,4 @@ + + libodbcdrvcfg1S_la_SOURCES = drvcfg1.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/drvcfg2/Makefile.am ++++ DRVConfig/drvcfg2/Makefile.am +@@ -8,3 +8,4 @@ + + libodbcdrvcfg2S_la_SOURCES = drvcfg2.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/esoob/Makefile.am ++++ DRVConfig/esoob/Makefile.am +@@ -8,3 +8,4 @@ + + libesoobS_la_SOURCES = esoobS.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/nn/Makefile.am ++++ DRVConfig/nn/Makefile.am +@@ -8,3 +8,4 @@ + + libodbcnnS_la_SOURCES = drvcfg.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/oplodbc/Makefile.am ++++ DRVConfig/oplodbc/Makefile.am +@@ -8,3 +8,4 @@ + + liboplodbcS_la_SOURCES = oplodbc.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/sapdb/Makefile.am ++++ DRVConfig/sapdb/Makefile.am +@@ -9,3 +9,5 @@ + libsapdbS_la_SOURCES = sapdb.c + + EXTRA_DIST = README ++ ++libdir = @libdir@/unixODBC +--- DRVConfig/tds/Makefile.am ++++ DRVConfig/tds/Makefile.am +@@ -8,3 +8,4 @@ + + libtdsS_la_SOURCES = tdsS.c + ++libdir = @libdir@/unixODBC +--- DRVConfig/txt/Makefile.am ++++ DRVConfig/txt/Makefile.am +@@ -8,3 +8,4 @@ + + libodbctxtS_la_SOURCES = drvcfg.c + ++libdir = @libdir@/unixODBC +--- Drivers/Postgre7.1/Makefile.am ++++ Drivers/Postgre7.1/Makefile.am +@@ -69,3 +69,5 @@ + statement.c \ + tuple.c \ + tuplelist.c ++ ++libdir = @libdir@/unixODBC +--- Drivers/PostgreSQL/Makefile.am ++++ Drivers/PostgreSQL/Makefile.am +@@ -64,3 +64,5 @@ + statement.c \ + tuple.c \ + tuplelist.c ++ ++libdir = @libdir@/unixODBC +--- Drivers/nn/Makefile.am ++++ Drivers/nn/Makefile.am +@@ -76,3 +76,4 @@ + nndate.c \ + nntp.c + ++libdir = @libdir@/unixODBC +--- Drivers/txt/Makefile.am ++++ Drivers/txt/Makefile.am +@@ -112,3 +112,4 @@ + driver.h \ + driverextras.h + ++libdir = @libdir@/unixODBC +--- DRVConfig/Mimer/Makefile.am ++++ DRVConfig/Mimer/Makefile.am +@@ -8,3 +8,4 @@ + + libmimerS_la_SOURCES = mimerS.c + ++libdir = @libdir@/unixODBC +--- Drivers/template/Makefile.am ++++ Drivers/template/Makefile.am +@@ -101,3 +101,5 @@ + _NativeTypeDesc.c \ + _NativeTypeLength.c \ + _NativeTypePrecision.c ++ ++libdir = @libdir@/unixODBC diff --git a/unixODBC.changes b/unixODBC.changes new file mode 100644 index 0000000..fa62062 --- /dev/null +++ b/unixODBC.changes @@ -0,0 +1,345 @@ +------------------------------------------------------------------- +Wed Oct 18 12:02:13 CEST 2006 - anosek@suse.cz + +- updated to version 2.2.12 + * Add missing SQLSetStmtOptionA and SQLSetStmtOptionW + * The config string being passed into ConfigDsn was wrong, + removed semicolon, and added terminating double null + * Add help help to isql + * Alter odbctest FullConnect to use SQLDriverConnect + * Replace a missed flag for true 64 bit operation + * Add ODBC3<->ODBC2 type mapping in SQLSetParam + * Tidy up the search for GUI lib code in SQLManageDatasource + * Fix possible exit from SQLConnect without having closed + in the driver + * Alter args to SQLParamOptions + * Fix bug preventing attribute length from being returned from + SQLDrivers + * Fixed broken iusql +- dropped obsolete unixODBC-2.2.12.patch unixODBC-qt-dirs.patch + +------------------------------------------------------------------- +Thu Jun 15 15:31:15 CEST 2006 - mmarek@suse.cz + +- moved %{_libdir}/unixODBC/*.so to main package, so that libfoo.so + and libfooS.so can be used in driver configuration. + +------------------------------------------------------------------- +Thu Jun 15 10:06:51 CEST 2006 - mmarek@suse.cz + +- updated distributed libltdl to make autoconf happy +- dropped unixODBC-gui-gtk + +------------------------------------------------------------------- +Mon Mar 27 17:21:34 CEST 2006 - mmarek@suse.cz + +- fixed some uninitialized variables reported by David Binderman + [#160570] (uninitialized.patch) + +------------------------------------------------------------------- +Tue Jan 31 17:32:52 CET 2006 - mmarek@suse.cz + +- fixed txt driver + [#146507] (sqp.patch) + +------------------------------------------------------------------- +Wed Jan 25 21:42:27 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Jan 20 01:26:05 CET 2006 - ro@suse.de + +- split gui packages to own specfile + +------------------------------------------------------------------- +Tue Jan 17 15:57:16 CET 2006 - sbrabec@suse.cz + +- Remove unneeded libunicode from neededforbuild. + +------------------------------------------------------------------- +Tue Nov 29 16:06:47 CET 2005 - mmarek@suse.cz + +- fix build with flex-2.5.31 + (flex.patch) + +------------------------------------------------------------------- +Tue Nov 1 15:44:32 CET 2005 - mmarek@suse.cz + +- add libtool and libinilc symbols to odbcinst/odbcinst.exp + (#131175) +- disable unixODBC-2.2.11-dm.patch since it's probably no more + needed + +------------------------------------------------------------------- +Thu Oct 20 16:38:38 CEST 2005 - mmarek@suse.cz + +- remove LT_GLOBAL flag from libtool to enable dlopen()ing libodbc.so + (#96312) +- remove headers for compatibility with qt3 (no longer needed) +- added norootforbuild + +------------------------------------------------------------------- +Tue Sep 27 11:21:59 CEST 2005 - mmarek@suse.cz + +- compile with --disable-stats to prevent DoS [#118547] + +------------------------------------------------------------------- +Mon Sep 19 16:14:53 CEST 2005 - mmarek@suse.cz + +- fix gcc warnings about implicit function declarations + +------------------------------------------------------------------- +Wed Apr 27 11:38:56 CEST 2005 - ltinkl@suse.cz + +- updated to 2.2.11 +- fix build with gcc4 + +------------------------------------------------------------------- +Tue Apr 12 22:56:40 CEST 2005 - ro@suse.de + +- added audiofile-devel to neededforbuild + +------------------------------------------------------------------- +Fri Feb 11 18:36:52 CET 2005 - ltinkl@suse.cz + +- update to 2.2.10, adapt patches + +------------------------------------------------------------------- +Wed Nov 10 18:21:25 CET 2004 - ro@suse.de + +- reduced neededforbuild + +------------------------------------------------------------------- +Tue Sep 14 11:32:50 CEST 2004 - ltinkl@suse.cz + +- put the .desktop file in the right package (#44790) + +------------------------------------------------------------------- +Tue Jul 27 00:18:51 CEST 2004 - ro@suse.de + +- fix some compiler warnings + +------------------------------------------------------------------- +Mon Jul 19 13:12:23 CEST 2004 - ltinkl@suse.cz + +- update to 2.2.9 + +------------------------------------------------------------------- +Mon May 24 14:34:54 CEST 2004 - ro@suse.de + +- fix some compiler warnings + +------------------------------------------------------------------- +Tue Mar 23 12:32:00 CET 2004 - ltinkl@suse.cz + +- don't package generated files (#36304) + +------------------------------------------------------------------- +Thu Feb 26 13:52:57 CET 2004 - kukuk@suse.de + +- Obsolete libiodbc-devel instead of conflicting with it. +- provide 64bit libodbcinst.so/libobdc.so on all 64bit + architectures. + +------------------------------------------------------------------- +Wed Feb 25 11:47:52 CET 2004 - schwab@suse.de + +- Provide libodbcinst.so()(64bit), libodbc.so()(64bit) on ia64 for + BEAJava2 [#29515]. + +------------------------------------------------------------------- +Fri Feb 20 12:00:06 CET 2004 - ltinkl@suse.cz + +- update to 2.2.8 + +------------------------------------------------------------------- +Wed Jan 14 18:07:04 CET 2004 - ltinkl@suse.cz + +- added patch to fix SQL results + +------------------------------------------------------------------- +Wed Dec 03 12:08:02 CET 2003 - ltinkl@suse.cz + +- update to 2.2.7 + +------------------------------------------------------------------- +Fri Sep 05 09:23:42 CEST 2003 - ltinkl@suse.cz + +- fix #29515 + +------------------------------------------------------------------- +Mon Sep 01 15:23:49 CEST 2003 - ltinkl@suse.cz + +- created patch unixODBC-odbctest.patch to fix #29639 + +------------------------------------------------------------------- +Fri Aug 15 16:56:36 CEST 2003 - adrian@suse.de + +- add desktop file + +------------------------------------------------------------------- +Wed Jul 30 17:01:22 CEST 2003 - ro@suse.de + +- fix gODBCconfig configure.in for autoreconf + +------------------------------------------------------------------- +Wed Jul 30 16:01:00 CEST 2003 - ltinkl@suse.de + +- update to version 2.2.6 + +------------------------------------------------------------------- +Tue Jul 29 22:54:52 CEST 2003 - ro@suse.de + +- remove traces of buildroot from installed files + +------------------------------------------------------------------- +Fri Jul 18 15:04:23 CEST 2003 - sbrabec@suse.cz + +- GNOME prefix change to /opt/gnome. + +------------------------------------------------------------------- +Mon Jul 14 16:55:08 CEST 2003 - sbrabec@suse.cz + +- Added gnome-filesystem to neededforbuild. + +------------------------------------------------------------------- +Mon Jun 23 18:49:25 CEST 2003 - ro@suse.de + +- fix for current automake + +------------------------------------------------------------------- +Fri Dec 27 18:56:56 CET 2002 - prehak@suse.cz + +- temporarily added two header files from Qt which make it build with Qt-3.1.1 + (remove them when they won't be needed to build) + +------------------------------------------------------------------- +Tue Nov 19 15:51:30 CET 2002 - ro@suse.de + +- add AM_GNU_GETTEXT_VERSION + +------------------------------------------------------------------- +Sun Nov 17 22:04:04 CET 2002 - prehak@suse.cz + +- fixed to build with autoconf 2.56 + +------------------------------------------------------------------- +Tue Nov 12 15:43:44 CET 2002 - tcrhak@suse.cz + +- fixed for bison 1.75: end rules with semicolons + +------------------------------------------------------------------- +Tue Oct 01 15:19:08 CEST 2002 - prehak@suse.cz + +- updated to version 2.2.3 +- libodbcinstQ.{so,la} moved from unixODBC-devel to unixODBC-gui-qt + [#19743] + +------------------------------------------------------------------- +Fri Sep 27 14:35:56 CEST 2002 - ro@suse.de + +- Added alsa alsa-devel to neededforbuild (esound) + +------------------------------------------------------------------- +Mon Sep 9 16:27:41 CEST 2002 - meissner@suse.de + +- Use qt3 instead of qt2. + +------------------------------------------------------------------- +Sun Aug 18 14:27:27 CEST 2002 - prehak@suse.cz + +- fixed segfaulting isql when using SAPDB driver + (created unixODBC-segfault.dif) + +------------------------------------------------------------------- +Mon Aug 12 13:55:53 CEST 2002 - schwab@suse.de + +- Fix configure script. + +------------------------------------------------------------------- +Sat Jul 27 13:07:48 CEST 2002 - adrian@suse.de + +- fix neededforbuild + +------------------------------------------------------------------- +Tue Jul 9 15:33:13 CEST 2002 - prehak@suse.de + +- updated to version 2.2.2 (mainly bugfixes, some unicode changes) + +------------------------------------------------------------------- +Mon Jun 10 17:44:47 CEST 2002 - prehak@suse.cz + +- updated to version 2.2.1 (mainly bugfixes) +- changed group to Productivity/Databases/Tools +- changed path for .ini files to /etc/unixODBC/ + and path for drivers to /usr/lib/unixODBC/ +- removed sample odbcinst.ini (TXT driver is not used so freqvently) +- created patch to apply %{_lib} macro +- added new configure feature --with-odbc-libs in gODBCConfig +- moved *.so files to devel package +- created README.SuSE + +------------------------------------------------------------------- +Thu May 16 12:26:10 CEST 2002 - ro@suse.de + +- use libdir + +------------------------------------------------------------------- +Fri Apr 5 01:16:42 CEST 2002 - ro@suse.de + +- build with current autoconf/automake/gettext + +------------------------------------------------------------------- +Wed Feb 27 19:34:37 CET 2002 - poeml@suse.de + +- don't include the (empty anyway) .ini files to the package, to + avoid a file conflict with the libiodbc package. The .ini files + are now packed as %ghost and touched in %post in both packages. +- rewrote %post to not use absolute paths. + +------------------------------------------------------------------- +Tue Jan 8 17:52:57 CET 2002 - ro@suse.de + +- help libtool with RPM_BUILD_ROOT + +------------------------------------------------------------------- +Fri Jan 4 17:22:55 CET 2002 - poeml@suse.de + +- update to 2.1.1 (bugfixes, 64 bit fixes, support for FILEDSN's, + changes to ODBCConfig. See http://www.unixodbc.org/ for the + changelog.) +- add new libodbcinstQ.so* to filelist +- remove libodbccr.so* from filelist (not to be installed) + +------------------------------------------------------------------- +Fri Nov 9 01:47:39 CET 2001 - ro@suse.de + +- use qt-devel-packages in neededforbuild + +------------------------------------------------------------------- +Tue Oct 2 10:53:21 CEST 2001 - rbarn@suse.de + +- update to version 2.0.9 +- Fix small bug in postgres driver + +------------------------------------------------------------------- +Sun May 13 18:20:03 CEST 2001 - schwab@suse.de + +- Fix missing declarations. + +------------------------------------------------------------------- +Wed May 9 14:16:55 CEST 2001 - poeml@suse.de + +- bzip2 sources + +------------------------------------------------------------------- +Fri Apr 13 11:45:16 CEST 2001 - ro@suse.de + +- hack for new gettext + +------------------------------------------------------------------- +Sun Apr 1 18:04:04 CEST 2001 - mfrueh@suse.de + +- created initial package + diff --git a/unixODBC.spec b/unixODBC.spec new file mode 100644 index 0000000..6daa7e0 --- /dev/null +++ b/unixODBC.spec @@ -0,0 +1,319 @@ +# +# spec file for package unixODBC (Version 2.2.12) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: unixODBC +BuildRequires: gcc-c++ +Version: 2.2.12 +Release: 10 +Summary: ODBC driver manager with some drivers included +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +URL: http://www.unixodbc.org/ +Group: Productivity/Databases/Tools +Autoreqprov: on +Provides: libodbcinst.so, libodbc.so +%ifarch ia64 x86_64 s390x ppc64 +Provides: libodbcinst.so()(64bit), libodbc.so()(64bit) +%endif +Source: unixODBC-%{version}.tar.bz2 +Source1: README.SuSE +Patch1: unixODBC-paths.patch +Patch4: unixODBC-odbctest.patch +Patch5: unixODBC-iaddr.patch +Patch6: unixODBC-nonvoid.patch +Patch7: unixODBC-gccwarnings.patch +Patch8: unixODBC-%{version}-dm.patch +# this is applied in %%build +Patch9: unixODBC-%{version}-dlopen.patch +Patch10: %{name}-%{version}-libodbcinst-exports.patch +Patch11: %{name}-%{version}-flex.patch +Patch12: %{name}-%{version}-sqp.patch +Patch13: %{name}-%{version}-uninitialized.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%package devel +Summary: Includes and Static Libraries for ODBC Development +Group: Development/Libraries/C and C++ +Autoreqprov: on +Obsoletes: libiodbc-devel +Requires: %{name} = %{version} + +%description +UnixODBC aims to provide a complete ODBC solution for the Linux +platform. Further drivers can be found at http://www.unixodbc.org/. + + + +Authors: +-------- + Peter Harvey + Nick Gorham + + +%description devel +Includes and static libraries for ODBC development (based on unixODBC). + + + +Authors: +-------- + Peter Harvey + Nick Gorham + +%prep +%setup -q +%patch1 +%patch4 +%patch5 +%patch6 +%patch7 +#patch8 -p1 +# %%patch9 is in %%build +%patch10 +%patch11 +%patch12 +%patch13 +install -m 644 %{S:1} . + +%build +export -n LANG LINGUAS LC_ALL +rm -rf libltdl +LIBTOOLIZE="libtoolize --ltdl" autoreconf --force --install +patch -p0 <"%{P:9}" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +./configure \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --libdir=%{_libdir} \ + --sysconfdir=%{_sysconfdir}/%{name} \ + --enable-gui=no \ + --disable-stats + +make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" + +%install +install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT/%{_libdir}/%{name} +make DESTDIR=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/usr/share/libtool +# packaged in gui-gtk +rm -f $RPM_BUILD_ROOT/%{_libdir}/libmimerS.* + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING ChangeLog NEWS README README.GTK README.SuSE doc/*.html doc/*.gif +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/ODBCDataSources +%dir %{_libdir}/%{name} +%config %{_sysconfdir}/%{name}/odbc.ini +%config %{_sysconfdir}/%{name}/odbcinst.ini +%{_prefix}/bin/dltest +%{_prefix}/bin/isql +%{_prefix}/bin/iusql +%{_prefix}/bin/odbcinst +%{_prefix}/bin/odbc_config +%{_libdir}/libodbc.so +%{_libdir}/libodbc.so.* +#%{_libdir}/libodbcextras.so.* +%{_libdir}/libodbcinst.so +%{_libdir}/libodbcinst.so.* +%{_libdir}/libboundparam.so.* +%{_libdir}/libgtrtst.so.* +%{_libdir}/libodbccr.so.* +%{_libdir}/unixODBC/*.so* + +%files devel +%defattr(-, root, root) +%{_includedir}/* +%{_libdir}/libboundparam.la +%{_libdir}/libgtrtst.la +%{_libdir}/libodbc.la +%{_libdir}/libodbccr.la +#%{_libdir}/libodbcextras.la +%{_libdir}/libodbcinst.la +%{_libdir}/libboundparam.so +%{_libdir}/libgtrtst.so +%{_libdir}/libodbccr.so +#%{_libdir}/libodbcextras.so +%{_libdir}/unixODBC/*.la + +%changelog -n unixODBC +* Wed Oct 18 2006 - anosek@suse.cz +- updated to version 2.2.12 + * Add missing SQLSetStmtOptionA and SQLSetStmtOptionW + * The config string being passed into ConfigDsn was wrong, + removed semicolon, and added terminating double null + * Add help help to isql + * Alter odbctest FullConnect to use SQLDriverConnect + * Replace a missed flag for true 64 bit operation + * Add ODBC3<->ODBC2 type mapping in SQLSetParam + * Tidy up the search for GUI lib code in SQLManageDatasource + * Fix possible exit from SQLConnect without having closed + in the driver + * Alter args to SQLParamOptions + * Fix bug preventing attribute length from being returned from + SQLDrivers + * Fixed broken iusql +- dropped obsolete unixODBC-2.2.12.patch unixODBC-qt-dirs.patch +* Thu Jun 15 2006 - mmarek@suse.cz +- moved %%{_libdir}/unixODBC/*.so to main package, so that libfoo.so + and libfooS.so can be used in driver configuration. +* Thu Jun 15 2006 - mmarek@suse.cz +- updated distributed libltdl to make autoconf happy +- dropped unixODBC-gui-gtk +* Mon Mar 27 2006 - mmarek@suse.cz +- fixed some uninitialized variables reported by David Binderman + [#160570] (uninitialized.patch) +* Tue Jan 31 2006 - mmarek@suse.cz +- fixed txt driver + [#146507] (sqp.patch) +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Fri Jan 20 2006 - ro@suse.de +- split gui packages to own specfile +* Tue Jan 17 2006 - sbrabec@suse.cz +- Remove unneeded libunicode from neededforbuild. +* Tue Nov 29 2005 - mmarek@suse.cz +- fix build with flex-2.5.31 + (flex.patch) +* Tue Nov 01 2005 - mmarek@suse.cz +- add libtool and libinilc symbols to odbcinst/odbcinst.exp + (#131175) +- disable unixODBC-2.2.11-dm.patch since it's probably no more + needed +* Thu Oct 20 2005 - mmarek@suse.cz +- remove LT_GLOBAL flag from libtool to enable dlopen()ing libodbc.so + (#96312) +- remove headers for compatibility with qt3 (no longer needed) +- added norootforbuild +* Tue Sep 27 2005 - mmarek@suse.cz +- compile with --disable-stats to prevent DoS [#118547] +* Mon Sep 19 2005 - mmarek@suse.cz +- fix gcc warnings about implicit function declarations +* Wed Apr 27 2005 - ltinkl@suse.cz +- updated to 2.2.11 +- fix build with gcc4 +* Tue Apr 12 2005 - ro@suse.de +- added audiofile-devel to neededforbuild +* Fri Feb 11 2005 - ltinkl@suse.cz +- update to 2.2.10, adapt patches +* Wed Nov 10 2004 - ro@suse.de +- reduced neededforbuild +* Tue Sep 14 2004 - ltinkl@suse.cz +- put the .desktop file in the right package (#44790) +* Tue Jul 27 2004 - ro@suse.de +- fix some compiler warnings +* Mon Jul 19 2004 - ltinkl@suse.cz +- update to 2.2.9 +* Mon May 24 2004 - ro@suse.de +- fix some compiler warnings +* Tue Mar 23 2004 - ltinkl@suse.cz +- don't package generated files (#36304) +* Thu Feb 26 2004 - kukuk@suse.de +- Obsolete libiodbc-devel instead of conflicting with it. +- provide 64bit libodbcinst.so/libobdc.so on all 64bit + architectures. +* Wed Feb 25 2004 - schwab@suse.de +- Provide libodbcinst.so()(64bit), libodbc.so()(64bit) on ia64 for + BEAJava2 [#29515]. +* Fri Feb 20 2004 - ltinkl@suse.cz +- update to 2.2.8 +* Wed Jan 14 2004 - ltinkl@suse.cz +- added patch to fix SQL results +* Wed Dec 03 2003 - ltinkl@suse.cz +- update to 2.2.7 +* Fri Sep 05 2003 - ltinkl@suse.cz +- fix #29515 +* Mon Sep 01 2003 - ltinkl@suse.cz +- created patch unixODBC-odbctest.patch to fix #29639 +* Fri Aug 15 2003 - adrian@suse.de +- add desktop file +* Wed Jul 30 2003 - ro@suse.de +- fix gODBCconfig configure.in for autoreconf +* Wed Jul 30 2003 - ltinkl@suse.de +- update to version 2.2.6 +* Tue Jul 29 2003 - ro@suse.de +- remove traces of buildroot from installed files +* Fri Jul 18 2003 - sbrabec@suse.cz +- GNOME prefix change to /opt/gnome. +* Mon Jul 14 2003 - sbrabec@suse.cz +- Added gnome-filesystem to neededforbuild. +* Mon Jun 23 2003 - ro@suse.de +- fix for current automake +* Fri Dec 27 2002 - prehak@suse.cz +- temporarily added two header files from Qt which make it build with Qt-3.1.1 + (remove them when they won't be needed to build) +* Tue Nov 19 2002 - ro@suse.de +- add AM_GNU_GETTEXT_VERSION +* Sun Nov 17 2002 - prehak@suse.cz +- fixed to build with autoconf 2.56 +* Tue Nov 12 2002 - tcrhak@suse.cz +- fixed for bison 1.75: end rules with semicolons +* Tue Oct 01 2002 - prehak@suse.cz +- updated to version 2.2.3 +- libodbcinstQ.{so,la} moved from unixODBC-devel to unixODBC-gui-qt + [#19743] +* Fri Sep 27 2002 - ro@suse.de +- Added alsa alsa-devel to neededforbuild (esound) +* Mon Sep 09 2002 - meissner@suse.de +- Use qt3 instead of qt2. +* Sun Aug 18 2002 - prehak@suse.cz +- fixed segfaulting isql when using SAPDB driver + (created unixODBC-segfault.dif) +* Mon Aug 12 2002 - schwab@suse.de +- Fix configure script. +* Sat Jul 27 2002 - adrian@suse.de +- fix neededforbuild +* Tue Jul 09 2002 - prehak@suse.de +- updated to version 2.2.2 (mainly bugfixes, some unicode changes) +* Mon Jun 10 2002 - prehak@suse.cz +- updated to version 2.2.1 (mainly bugfixes) +- changed group to Productivity/Databases/Tools +- changed path for .ini files to /etc/unixODBC/ + and path for drivers to /usr/lib/unixODBC/ +- removed sample odbcinst.ini (TXT driver is not used so freqvently) +- created patch to apply %%{_lib} macro +- added new configure feature --with-odbc-libs in gODBCConfig +- moved *.so files to devel package +- created README.SuSE +* Thu May 16 2002 - ro@suse.de +- use libdir +* Fri Apr 05 2002 - ro@suse.de +- build with current autoconf/automake/gettext +* Wed Feb 27 2002 - poeml@suse.de +- don't include the (empty anyway) .ini files to the package, to + avoid a file conflict with the libiodbc package. The .ini files + are now packed as %%ghost and touched in %%post in both packages. +- rewrote %%post to not use absolute paths. +* Tue Jan 08 2002 - ro@suse.de +- help libtool with RPM_BUILD_ROOT +* Fri Jan 04 2002 - poeml@suse.de +- update to 2.1.1 (bugfixes, 64 bit fixes, support for FILEDSN's, + changes to ODBCConfig. See http://www.unixodbc.org/ for the + changelog.) +- add new libodbcinstQ.so* to filelist +- remove libodbccr.so* from filelist (not to be installed) +* Fri Nov 09 2001 - ro@suse.de +- use qt-devel-packages in neededforbuild +* Tue Oct 02 2001 - rbarn@suse.de +- update to version 2.0.9 +- Fix small bug in postgres driver +* Sun May 13 2001 - schwab@suse.de +- Fix missing declarations. +* Wed May 09 2001 - poeml@suse.de +- bzip2 sources +* Fri Apr 13 2001 - ro@suse.de +- hack for new gettext +* Sun Apr 01 2001 - mfrueh@suse.de +- created initial package