From a83366ec5f5d6fb3fb47260edf231bdcf002bdb1 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 13:46:58 +0000
Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20unixODB?=
 =?UTF-8?q?C-2.0.7-2.src.rpm=20Fri=20Jun=2015=202001=20Trond=20Eivind=20Gl?=
 =?UTF-8?q?omsr=F8d=20<teg@redhat.com>=20-=20Better=20default=20odbcinst.i?=
 =?UTF-8?q?ni=20-=20Minor=20cleanups=20Wed=20Jun=2006=202001=20Trond=20Eiv?=
 =?UTF-8?q?ind=20Glomsr=F8d=20<teg@redhat.com>=20-=202.0.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cvsignore    |  2 +-
 odbcinst.ini  | 14 +++++++++++++-
 sources       |  2 +-
 unixODBC.spec | 43 ++++++++++++++++++-------------------------
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d8efe7b..0f360e6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-unixODBC-1.8.13.tar.gz
+unixODBC-2.0.7.tar.gz
diff --git a/odbcinst.ini b/odbcinst.ini
index ae15e04..6962e5c 100644
--- a/odbcinst.ini
+++ b/odbcinst.ini
@@ -1,5 +1,17 @@
+# Example driver definitinions
+#
+#
+
+# Included in the unixODBC package
 [PostgreSQL]
 Description	= ODBC for PostgreSQL
 Driver		= /usr/lib/libodbcpsql.so
 Setup		= /usr/lib/libodbcpsqlS.so
-FileUsage	= 1
\ No newline at end of file
+FileUsage	= 1
+
+
+# From the MyODBC package
+#[MySQL]
+#Description	= ODBC for MySQL
+#Driver		= /usr/lib/libmyodbc.so
+#FileUsage	= 1
diff --git a/sources b/sources
index 98833b4..b2ea50d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-732338e03ab52a7382968ef2a0f6dd51  unixODBC-1.8.13.tar.gz
+7ed9e82587a04c56b7e248c1c61de9c0  unixODBC-2.0.7.tar.gz
diff --git a/unixODBC.spec b/unixODBC.spec
index 13f53a6..7005374 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC Driver Manager for Linux
 Name: unixODBC
-Version: 1.8.13
-Release: 3
+Version: 2.0.7
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
@@ -53,7 +53,7 @@ export QTDIR=
 # clean up old moc files
 (cd ODBCConfig && rm -f mclass*.cpp)
 (cd DataManager && rm -f mclass*.cpp)
-%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes
+%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-static=yes --enable-drivers
 make all
 
 %install
@@ -78,25 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc README COPYING AUTHORS ChangeLog NEWS INSTALL doc
-%config %{_sysconfdir}/odbc*
-%{_libdir}/libodbcinst.so.1*
-%{_libdir}/libodbc.so.1*
-%{_libdir}/libodbccr.so.1*
-%{_libdir}/libodbcdrvcfg1S.so.1*
-%{_libdir}/libodbcdrvcfg2S.so.1*
-%{_libdir}/libodbcpsql.so.1*
-%{_libdir}/libodbcpsqlS.so.1*
-%{_libdir}/libodbcminiS.so.1*
-%{_libdir}/libodbcmyS.so.1*
-%{_libdir}/liboraodbcS.so.1*
-%{_libdir}/libodbcnnS.so.1*
-%{_libdir}/libesoobS.so.1*
-%{_libdir}/liboplodbcS.so.1*
-%{_libdir}/libtdsS.so.1*
-%{_libdir}/libtemplate.so.1*
-%{_libdir}/libodbcextras.so.1*
-%{_libdir}/libodbctxt.so.1*
-%{_libdir}/libnn.so.1*
+%config(noreplace) %{_sysconfdir}/odbc*
+%{_libdir}/*so.*
 %{_bindir}/odbcinst
 %{_bindir}/isql
 %{_bindir}/dltest
@@ -105,7 +88,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/*.la
 %{_libdir}/*.a
 
 %files kde
@@ -123,8 +105,19 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
-* Fri Apr 27 2001 Bill Nottingham <notting@redhat.com>
-- rebuild for C++ exception handling on ia64
+* Fri Jun 15 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Better default odbcinst.ini
+- Minor cleanups
+
+* Wed Jun  6 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 2.0.7
+
+* Wed Apr 25 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Fix for isql segfault on EOF/ctrl-d exit
+
+* Fri Apr 20 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 2.0.6
+- add patch for 64 bit archs (dword shouldn't be "long int")
 
 * Wed Feb 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - rebuild