[gnome-db] Gnome DB 0.9 / FreeTDS 0.60 fixes

[David T Hollis <dhollis davehollis com>]

Here are some patches I created to get the 0.9 SRPMS (RH8) to compile 
correctly on my system.  I tweaked the FreeTDS spec file to put the .a 
files (static-link libs) in the -devel package for cleanliness and had 
to create a patch for the configure script for libgda to find the 
FreeTDS headers in the right place (/usr/include/freetds).

--- freetds.spec	2002-12-12 09:51:17.000000000 -0500
+++ freetds.spec.new	2002-12-30 00:57:39.000000000 -0500
@@ -3,16 +3,19 @@
  
 Name: %{name} 
 Version: %{version} 
-Release: 1 
+Release: 2
 Vendor: www.freetds.org 
 Copyright: LGPL 
 Group: System Environment/Libraries 
 Source: ftp://ftp.metalab.unc.edu/pub/Linux/ALPHA/freetds/%{name}-%{version}.tgz 
-BuildRoot: /var/tmp/%{name}-buildroot 
-Summary: FreeTDS is a free re-implementation of the TDS (Tabular DataStream) protocol that is used by Sybase and Microsoft for their database products. 
+BuildRoot: %{_tmppath}/%{name}-buildroot 
+Summary: FreeTDS is a free re-implementation of the TDS (Tabular DataStream) protocol that is used by Sybase and Microsoft for their database products.
  
 %description 
-FreeTDS is a project to document and implement the TDS (Tabular DataStream) protocol. TDS is used by Sybase and Microsoft for client to database server communications. FreeTDS includes call level interfaces for DB-Lib, CT-Lib, and ODBC.  
+FreeTDS is a project to document and implement the TDS (Tabular DataStream)
+protocol. TDS is used by Sybase and Microsoft for client to database server
+communications. FreeTDS includes call level interfaces for DB-Lib, CT-Lib,
+and ODBC.  
  
 %package devel 
 Group: Development/Libraries 
@@ -20,7 +23,8 @@
 Requires: freetds = %{version}
  
 %description devel 
-The freetds-devel package contains the files necessary for development with with the Free TDS libraries. 
+The freetds-devel package contains the files necessary for development
+with with the Free TDS libraries. 
  
 %prep 
 %setup 
@@ -59,18 +63,13 @@
 %files 
 %defattr(-,root,root) 
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO 
-%{_libdir}/libct.a
-%{_libdir}/libct.so*
-%{_libdir}/libsybdb.a
-%{_libdir}/libsybdb.so*
-%{_libdir}/libtds.a
-%{_libdir}/libtds.so*
-%{_libdir}/libtdsodbc.a
-%{_libdir}/libtdsodbc.so*
+%{_libdir}/lib*.so*
 %config %{_sysconfdir}/freetds.conf
  
 %files devel 
 %defattr (-,root,root) 
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
 %{_includedir}/freetds/bkpublic.h 
 %{_includedir}/freetds/cstypes.h 
 %{_includedir}/freetds/cspublic.h 
@@ -89,9 +88,14 @@
 %{_includedir}/freetds/tds_configs.h 
  
 %changelog 
+* Sun Dec 30 2002 David Hollis <dhollis davehollis com>
+- 0.60 tweaked.  Move .a & .la files to -devel package
+
 * Thu Dec 20 2001 Brian Bruns <camber ais org> 
 - Modifications for 0.53 ver and removing interfaces file
+
 * Wed Jun 28 2001 Brian Bruns <camber ais org> 
 - Modifications for 0.52 ver and ODBC drivers 
+
 * Wed Feb 14 2001 David Hollis <dhollis emagisoft com> 
 - First stab at RPM for 0.51 ver 

--- configure.in.orig	2002-12-30 00:55:56.000000000 -0500
+++ configure.in	2002-12-30 00:56:56.000000000 -0500
@@ -284,7 +284,7 @@
 	AC_MSG_CHECKING(for freetds files)
 	for d in $dir /usr/local/freetds /usr /opt/freetds /opt/packages/freetds /opt/freetds-0.50
 	do
-		if test -f "$d/include/tds.h" -a -e "$d/lib/libtds.so" -a -f "$d/include/tdsver.h"
+		if test -f "$d/include/freetds/tds.h" -a -e "$d/lib/libtds.so" -a -f "$d/include/freetds/tdsver.h"
 		then
 			AC_MSG_RESULT(found freetds in $d)
 			freetdsdir="$d"
@@ -296,7 +296,7 @@
 		AC_MSG_WARN(tds backend not used)
 	else
 		AC_MSG_CHECKING(for freetds version)
-		freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO \)\" $freetdsdir/include/tdsver.h|sed 's|^.*"\(.*\)"|\1|'`"
+		freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO \)\" $freetdsdir/include/freetds/tdsver.h|sed 's|^.*"\(.*\)"|\1|'`"
 		if test "x$freetdsvercheck" = "x"
 		then
 			AC_MSG_WARN(freetds version check failed - backend not used)
@@ -305,13 +305,13 @@
 			case "$freetdsvercheck" in
 				*v0.5*) AC_MSG_RESULT($freetdsvercheck - using v0.5x api)
 					AC_DEFINE(HAVE_FREETDS_VER0_5X)
-					FREETDS_CFLAGS="-I${freetdsdir}/include"
+					FREETDS_CFLAGS="-I${freetdsdir}/include/freetds"
 					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
 					AC_DEFINE(HAVE_FREETDS)
 					;;
 				*v0.6*) AC_MSG_RESULT($freetdsvercheck - using v0.6x api)
 					AC_DEFINE(HAVE_FREETDS_VER0_6X)
-					FREETDS_CFLAGS="-I${freetdsdir}/include"
+					FREETDS_CFLAGS="-I${freetdsdir}/include/freetds"
 					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
 					AC_DEFINE(HAVE_FREETDS)
 					;;

--- libgda.spec	2002-12-30 00:49:37.000000000 -0500
+++ libgda.spec.new	2002-12-30 01:12:17.000000000 -0500
@@ -13,7 +13,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          0.9.0
-Release:          1
+Release:          2
 Source:           %{name}-%{version}.tar.gz
 Patch1:		  libgda-0.9.0-configure.patch
 URL:              http://www.gnome-db.org/
@@ -46,6 +46,9 @@
 BuildRequires:    unixODBC-devel
 %endif
 
+%if %{SQLITE}
+BuildRequires:	  sqlite-devel
+%endif
 
 %description
 libgda is a library that eases the task of writing
@@ -211,6 +214,7 @@
 %dir %{_libdir}/libgda
 %dir %{_libdir}/libgda/providers
 %{_libdir}/libgda/providers/libgda-default.so
+%{_mandir}/man1/gda-config-tool.1*
 
 %files devel
 %defattr(-,root,root)
@@ -264,6 +268,10 @@
 
 
 %changelog
+* Sun Dec 30 2002 David Hollis <dhollis davehollis com> 0.9.0-2
+- Added sqlite-devel buildreq
+- Include gda-config-tool man page
+
 * Mon Aug 19 2002 Ben Liblit <liblit acm org>
 - Fixed version number substitutions