Hello community, here is the log from the commit of package mdbtools checked in at Thu Apr 12 18:11:08 CEST 2007. -------- --- mdbtools/mdbtools.changes 2007-03-30 15:07:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/mdbtools/mdbtools.changes 2007-04-10 16:21:36.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 10 16:20:59 CEST 2007 - uli@suse.de + +- update -> 20071004cvs (can read GameBase databases) + +------------------------------------------------------------------- Old: ---- mdbtools-0.5-codecleanup.diff mdbtools-0.5-duplicate_output.diff mdbtools-0.5-glib.diff mdbtools-0.5.tar.bz2 mdbtools-0.5-type_punning.diff New: ---- mdbtools-20070410cvs.tar.bz2 mdbtools-aliasingandendianness.patch mdbtools-doublefree.patch mdbtools-null.patch mdbtools-retvals.patch mdbtools-uninit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdbtools.spec ++++++ --- /var/tmp/diff_new_pack.Z27002/_old 2007-04-12 18:02:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Z27002/_new 2007-04-12 18:02:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mdbtools (Version 0.5) +# spec file for package mdbtools (Version 20070410cvs) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,27 +11,27 @@ # norootforbuild Name: mdbtools -BuildRequires: bison flex gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel readline-devel scrollkeeper unixODBC-devel update-desktop-files -%define _prefix /usr %define gnome_prefix %(pkg-config libgnomeui-2.0 --variable=prefix) %define gnome_datadir %{gnome_prefix}/share +BuildRequires: bison flex libglade2-devel libgnomeui-devel readline-devel unixODBC-devel update-desktop-files URL: http://mdbtools.sourceforge.net License: GNU General Public License (GPL) Group: Productivity/Databases/Tools Autoreqprov: on -Version: 0.5 -Release: 304 +Version: 20070410cvs +Release: 1 Summary: A Suite of Libraries and Programs to Access Microsoft Access Databases -Patch1: mdbtools-0.5-duplicate_output.diff -Patch2: mdbtools-0.5-codecleanup.diff -Patch3: mdbtools-0.5-glib.diff -Patch4: mdbtools-0.5-gnome_prefix.diff -Patch5: mdbtools-0.5-no_gmdb_h.diff -Patch6: mdbtools-0.5-type_punning.diff -Patch7: mdbtools-off_by_one.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %{name}-%{version}.tar.bz2 +Source: mdbtools-%{version}.tar.bz2 Source1: gmdb2.desktop +Patch: mdbtools-doublefree.patch +Patch1: mdbtools-off_by_one.patch +Patch2: mdbtools-0.5-gnome_prefix.diff +Patch3: mdbtools-aliasingandendianness.patch +Patch4: mdbtools-retvals.patch +Patch5: mdbtools-null.patch +Patch6: mdbtools-uninit.patch +Patch7: mdbtools-0.5-no_gmdb_h.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Mdbtools contains: mdb-dump -- simple hex dump utility for looking at @@ -45,10 +45,9 @@ %package devel +Requires: mdbtools mdbtools-odbc glib2-devel Group: Development/Libraries/C and C++ Summary: All files necessary for development with the MDB Tools libraries -Requires: mdbtools = %{version} glib2-devel -Autoreqprov: on %description devel Mdbtools contains: mdb-dump -- simple hex dump utility for looking at @@ -61,13 +60,11 @@ -%package odbc +%package gui Group: Productivity/Databases/Tools -Summary: MDB Tools ODBC driver for unixODBC -Autoreqprov: on -Requires: mdbtools = %{version} flex glib2-devel +Summary: A Suite of libraries and programs to access Microsoft Access databases -%description odbc +%description gui Mdbtools contains: mdb-dump -- simple hex dump utility for looking at mdb files mdb-schema -- prints DDL for the specified table mdb-export -- export table to CSV format mdb-tables -- a simple dump of table @@ -78,14 +75,11 @@ -%package gui +%package odbc Group: Productivity/Databases/Tools -Summary: A Suite of libraries and programs to access Microsoft Access databases -Autoreqprov: on -Requires: mdbtools = %{version} - +Summary: MDB Tools ODBC driver for unixODBC -%description gui +%description odbc Mdbtools contains: mdb-dump -- simple hex dump utility for looking at mdb files mdb-schema -- prints DDL for the specified table mdb-export -- export table to CSV format mdb-tables -- a simple dump of table @@ -97,7 +91,8 @@ %prep -%setup -q +%setup -n %name +%patch %patch1 %patch2 %patch3 @@ -107,28 +102,20 @@ %patch7 %build -%{?suse_update_config:%{suse_update_config -l -f}} -rm acinclude.m4 -autoreconf -I /opt/gnome/share/aclocal -fi -export CFLAGS="$RPM_OPT_FLAGS -W -Wall -Wstrict-prototypes -Wno-unused-parameter" -export CXXFLAGS="$RPM_OPT_FLAGS -W -Wall -Wstrict-prototypes -Wsign-promo -fmessage-length=0" -./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +./autogen.sh CFLAGS="$RPM_OPT_FLAGS" \ + --prefix=/usr --mandir=%{_mandir} \ + --build=%{_target_cpu}-suse-linux --libdir=%_libdir \ --with-unixodbc=/usr make +#make check %install -rm -rf "$RPM_BUILD_ROOT" -make DESTDIR="$RPM_BUILD_ROOT" install -rm -f $RPM_BUILD_ROOT/usr/bin/{prcat,prdata,prdump,prindex,prkkd,prole,prtable,unittest,updrow} -mkdir -p $RPM_BUILD_ROOT/%{gnome_datadir}/applications/ -install -m 0644 %SOURCE1 \ - $RPM_BUILD_ROOT/%{gnome_datadir}/applications/gmdb2.desktop +make install DESTDIR=$RPM_BUILD_ROOT +install -D -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{gnome_datadir}/applications/gmdb2.desktop %suse_update_desktop_file gmdb2 Office Database %clean -#rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post %run_ldconfig @@ -142,52 +129,47 @@ %postun odbc %run_ldconfig - %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO HACKING -%{_libdir}/libmdb.so.* -%{_libdir}/libmdbsql.so.* -%{_bindir}/mdb-schema -%{_bindir}/mdb-export -%{_bindir}/mdb-tables -%{_bindir}/mdb-header -%{_bindir}/mdb-parsecsv -%{_bindir}/mdb-dump -%{_bindir}/mdb-sql -%{_bindir}/mdb-ver -%{_bindir}/mdb-array -%{_mandir}/man1/* - +%doc README AUTHORS COPYING NEWS HACKING ChangeLog TODO +/usr/bin/mdb-* +%_libdir/libmdb.so.1 +%_libdir/libmdb.so.1.0.0 +%_libdir/libmdbsql.so.1 +%_libdir/libmdbsql.so.1.0.0 +%doc %_mandir/man1/mdb-*.1* %files devel -%defattr (-,root,root) -%{_includedir}/mdbtools.h -%{_includedir}/mdbsql.h -%{_libdir}/libmdb.a -%{_libdir}/libmdb.la -%{_libdir}/libmdbsql.a -%{_libdir}/libmdbsql.la -%{_libdir}/libmdb.so -%{_libdir}/libmdbsql.so - -%files odbc %defattr(-,root,root) -%{_libdir}/libmdbodbc.la -%{_libdir}/libmdbodbc.a -%{_libdir}/libmdbodbc.so* -%{_includedir}/connectparams.h -%{_includedir}/mdbodbc.h +/usr/include/mdb*.h +/usr/include/connectparams.h +%_libdir/libmdbsql.a +%_libdir/libmdbsql.la +%_libdir/libmdbsql.so +%_libdir/libmdb.a +%_libdir/libmdb.la +%_libdir/libmdb.so +%_libdir/libmdbodbc.a +%_libdir/libmdbodbc.la +%_libdir/libmdbodbc.so +%_libdir/pkgconfig/libmdb.pc +%_libdir/pkgconfig/libmdbsql.pc %files gui -%defattr (-,root,root) -%{gnome_prefix}/bin/gmdb2 -%{gnome_datadir}/gmdb -%{gnome_datadir}/gnome/help/gmdb -%{gnome_datadir}/applications/gmdb2.desktop +%defattr(-,root,root) +%gnome_prefix/bin/gmdb2 +%gnome_datadir/gmdb +%gnome_datadir/gnome/help/gmdb +%gnome_datadir/applications/gmdb2.desktop +%files odbc +%defattr(-,root,root) +%_libdir/libmdbodbc.so.0 +%_libdir/libmdbodbc.so.0.0.0 %changelog +* Tue Apr 10 2007 - uli@suse.de +- update -> 20071004cvs (can read GameBase databases) * Fri Mar 30 2007 - rguenther@suse.de - Add bison and flex BuildRequires * Thu Feb 16 2006 - pth@suse.de ++++++ mdbtools-0.5-gnome_prefix.diff ++++++ --- /var/tmp/diff_new_pack.Z27002/_old 2007-04-12 18:02:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Z27002/_new 2007-04-12 18:02:14.000000000 +0200 @@ -1,14 +1,14 @@ --- configure.in +++ configure.in -@@ -106,6 +106,8 @@ - AC_SUBST(GNOME_CFLAGS) - AC_SUBST(GNOME_LIBS) - OPTDIRS="$OPTDIRS gmdb2" -+ GNOME_PREFIX=`pkg-config libgnomeui-2.0 --variable=prefix` -+ AC_SUBST(GNOME_PREFIX) - fi - - AC_SUBST([OPTDIRS]) +@@ -124,6 +124,8 @@ + AC_SUBST(GNOME_CFLAGS) + AC_SUBST(GNOME_LIBS) + OPTDIRS="$OPTDIRS gmdb2" ++ GNOME_PREFIX=`pkg-config libgnomeui-2.0 --variable=prefix` ++ AC_SUBST(GNOME_PREFIX) + fi + else + AC_MSG_NOTICE(gmdb2 disabled) --- src/gmdb2/Makefile.am +++ src/gmdb2/Makefile.am @@ -1,3 +1,4 @@ @@ -20,7 +20,7 @@ +++ src/gmdb2/gladefiles/Makefile.am @@ -1,3 +1,4 @@ +prefix = @GNOME_PREFIX@ - gladedir = $(datadir)/gmdb/glade/ + gladedir = $(datadir)/gmdb/glade glade_DATA = \ --- src/gmdb2/help/C/Makefile.am @@ -28,8 +28,8 @@ @@ -1,3 +1,4 @@ +prefix = @GNOME_PREFIX@ figs = \ - figures/gmdb2_window.png - docname = gmdb + figures/gmdb2_window.png \ + figures/gmdb2_sql_window.png --- src/gmdb2/pixmaps/Makefile.am +++ src/gmdb2/pixmaps/Makefile.am @@ -1,3 +1,4 @@ ++++++ mdbtools-aliasingandendianness.patch ++++++ --- src/libmdb/data.c +++ src/libmdb/data.c @@ -387,11 +387,13 @@ g_ptr_array_index(pages, table->cur_pg_num-1), fmt->pg_size); } else if (table->strategy==MDB_INDEX_SCAN) { - - if (!mdb_index_find_next(table->mdbidx, table->scan_idx, table->chain, &pg, (guint16 *) &(table->cur_row))) { + guint16 tmp = (guint16)table->cur_row; + if (!mdb_index_find_next(table->mdbidx, table->scan_idx, table->chain, &pg, &tmp)) { + table->cur_row = tmp; mdb_index_scan_free(table); return 0; } + table->cur_row = tmp; mdb_read_pg(mdb, pg); } else { rows = mdb_get_int16(mdb->pg_buf,fmt->row_count_offset); ++++++ mdbtools-doublefree.patch ++++++ --- src/libmdb/data.c +++ src/libmdb/data.c 2007/04/10 11:19:10 @@ -231,7 +231,7 @@ col->col_type, len); } strcpy(col->bind_ptr, str); - g_free(str); + //g_free(str); } ret = strlen(col->bind_ptr); if (col->len_ptr) { @@ -679,7 +679,7 @@ fprintf(stderr, "Warning: incorrect memo length\n"); } mdb_unicode2ascii(mdb, tmp, tmpoff, text, MDB_BIND_SIZE); - g_free(tmp); + //g_free(tmp); return text; } else { fprintf(stderr, "Unhandled memo field flags = %02x\n", memo_len >> 24); ++++++ mdbtools-null.patch ++++++ --- src/gmdb2/debug.c +++ src/gmdb2/debug.c @@ -485,7 +485,7 @@ (flags & MDB_IDX_REQUIRED) ? " Required" : "", NULL); if (strcmp(str, "Index Flags:") == 0) { - gchar *str2 = g_strconcat(str, " None"); + gchar *str2 = g_strconcat(str, " None", NULL); g_free(str); str = str2; } ++++++ mdbtools-retvals.patch ++++++ --- src/gmdb2/info.c +++ src/gmdb2/info.c @@ -71,4 +71,6 @@ gtk_label_set_text(GTK_LABEL(label), tmpstr); g_free(filepath); + + return NULL; } ++++++ mdbtools-uninit.patch ++++++ --- src/util/prindex.c +++ src/util/prindex.c @@ -115,7 +115,7 @@ void walk_index(MdbHandle *mdb, MdbIndex *idx) { - int start, len; + int start = 0, len = 0; // I seriously doubt this function does anything useful. guint32 pg; guint16 row; MdbHandle *mdbidx; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org