rpms/xbsql/devel xbsql-0.11-xbase64.patch, NONE, 1.1 xbsql.spec, 1.10, 1.11

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/xbsql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26397

Modified Files:
	xbsql.spec 
Added Files:
	xbsql-0.11-xbase64.patch 
Log Message:
rebuild against new xbase

xbsql-0.11-xbase64.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 xbsql.cpp   |    4 ++--
 xbsql.h     |    3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE xbsql-0.11-xbase64.patch ---
diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am
--- xbsql-0.11/xbsql/Makefile.am.BAD	2009-08-19 23:32:27.481185284 -0400
+++ xbsql-0.11/xbsql/Makefile.am	2009-08-19 23:32:47.157206308 -0400
@@ -17,10 +17,10 @@ libxbsql_la_SOURCES	= xb_value.cpp xb_el
 			  xb_assignlist.cpp xb_create.cpp \
 			  xbsql.tab.c xb_datetime.cpp
 
-libxbsql_la_LDFLAGS	= -lxbase $(DEBUG)
+libxbsql_la_LDFLAGS	= -lxbase64 $(DEBUG)
 
 xql_SOURCES		= xql.cpp
-xql_LDADD		= -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD		= -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
 
 #
 #
diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in
--- xbsql-0.11/xbsql/Makefile.in.BAD	2009-08-19 23:32:54.384058775 -0400
+++ xbsql-0.11/xbsql/Makefile.in	2009-08-19 23:33:03.928059382 -0400
@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el
 			  xbsql.tab.c xb_datetime.cpp
 
 
-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
+libxbsql_la_LDFLAGS = -lxbase64 $(DEBUG)
 
 xql_SOURCES = xql.cpp
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
 
 
 #install-data-hook:
diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp
--- xbsql-0.11/xbsql/xbsql.cpp.BAD	2009-08-19 23:34:23.880063863 -0400
+++ xbsql-0.11/xbsql/xbsql.cpp	2009-08-19 23:34:47.393184432 -0400
@@ -207,7 +207,7 @@ void	XBaseSQL::setError
 			break	;
 
 		default	:
-			e	= xbStrError (rc) ;
+			e	= GetErrorMessage (rc) ;
 			break	;
 	}
 
@@ -230,7 +230,7 @@ void	XBaseSQL::setError
 	char	t[1024]	;
 	va_list	aptr	;
 
-	strcpy	  (t, xbStrError (rc)) ;
+	strcpy	  (t, GetErrorMessage (rc)) ;
 	strcat	  (t, ": ") ;
 	int	  l = strlen(t) ;
 
diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h
--- xbsql-0.11/xbsql/xbsql.h.BAD	2009-08-19 23:35:45.087088919 -0400
+++ xbsql-0.11/xbsql/xbsql.h	2009-08-19 23:34:06.949184421 -0400
@@ -43,8 +43,7 @@ XBSQL_API int	strncasecmp (const char *s
 
 #endif
 
-#include	<xbase/xbase.h>
-#include	<xbase/xbexcept.h>
+#include	<xbase64/xbase64.h>
 
 class	XBaseSQL	;
 class	XBSQLTable	;


Index: xbsql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xbsql/devel/xbsql.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xbsql.spec	27 Jul 2009 07:38:06 -0000	1.10
+++ xbsql.spec	20 Aug 2009 03:46:00 -0000	1.11
@@ -1,14 +1,15 @@
 Name:		xbsql
 Summary:	A SQL wrapper for xbase
 Version:	0.11
-Release:	13%{?dist}
+Release:	14%{?dist}
 Group:		Development/Libraries
 License:	LGPLv2+
 URL:		http://www.quaking.demon.co.uk/xbsql/
 Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbase-devel, ncurses-devel, readline-devel, bison
+BuildRequires:	xbase-devel >= 3.1.2, ncurses-devel, readline-devel, bison, libtool
 Patch0:		xbsql-0.11-ncurses64.patch
+Patch1:		xbsql-0.11-xbase64.patch
 
 %description
 XBSQL is a wrapper library which provides an SQL-subset interface to Xbase 
@@ -26,10 +27,11 @@ Headers and libraries for compiling prog
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-14
+- update for new xbase
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild