automatic version update by autodist [release 1.0.1-1mamba;Sat Dec 28 2024]

2024-12-29 12:19:50 +01:00
parent ad0369cd57
commit b7533ee975
3 changed files with 4 additions and 124 deletions
--- a/mdbtools-0.6pre1-gcc4.patch
+++ b/mdbtools-0.6pre1-gcc4.patch
@@ -1,13 +0,0 @@
-diff -Nru mdbtools-0.6pre1.orig/include/mdbtools.h mdbtools-0.6pre1/include/mdbtools.h
--- mdbtools-0.6pre1.orig/include/mdbtools.h	2004-06-17 01:42:19.000000000 +0200
-+++ mdbtools-0.6pre1/include/mdbtools.h	2007-11-07 15:27:29.000000000 +0100
-@@ -146,9 +146,6 @@
- #define IS_JET4(mdb) (mdb->f->jet_version==MDB_VER_JET4)
- #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
- 
-/* hash to store registered backends */
-extern GHashTable	*mdb_backends;
-
- /* forward declarations */
- typedef struct mdbindex MdbIndex;
- typedef struct mdbsargtree MdbSargNode;
--- a/mdbtools-0.6pre1-ooo.patch
+++ b/mdbtools-0.6pre1-ooo.patch
@@ -1,81 +0,0 @@
-diff -Nru mdbtools-0.6pre1.orig/src/gmdb2/gmdb.h mdbtools-0.6pre1/src/gmdb2/gmdb.h
--- mdbtools-0.6pre1.orig/src/gmdb2/gmdb.h	2004-02-11 23:04:26.000000000 +0100
-+++ mdbtools-0.6pre1/src/gmdb2/gmdb.h	2007-11-07 16:39:17.000000000 +0100
-@@ -24,6 +24,7 @@
- GtkWidget *gmdb_table_def_new(MdbCatalogEntry *entry);
- GtkWidget *gmdb_table_export_new(MdbCatalogEntry *entry);
- void gmdb_table_export(MdbCatalogEntry *entry) ;
-+gchar *gmdb_export_get_filepath(GladeXML *xml);
- 
- void gmdb_file_select_cb(GtkWidget *w, gpointer data);
- void gmdb_file_open_cb(GtkWidget *w, gpointer data);
-diff -Nru mdbtools-0.6pre1.orig/src/gmdb2/info.c mdbtools-0.6pre1/src/gmdb2/info.c
--- mdbtools-0.6pre1.orig/src/gmdb2/info.c	2003-01-12 23:59:42.000000000 +0100
-+++ mdbtools-0.6pre1/src/gmdb2/info.c	2007-11-07 16:37:20.000000000 +0100
-@@ -71,4 +71,7 @@
- 	gtk_label_set_text(GTK_LABEL(label), tmpstr);	
- 
- 	g_free(filepath);
-+	// a hack to avoid warning: control reaches end of non-void function
-+	// the return value is nowhere used anyway
-+	return NULL;
- }
-diff -Nru mdbtools-0.6pre1.orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
--- mdbtools-0.6pre1.orig/src/gmdb2/table_export.c	2003-01-14 18:37:44.000000000 +0100
-+++ mdbtools-0.6pre1/src/gmdb2/table_export.c	2007-11-07 16:39:27.000000000 +0100
-@@ -49,6 +49,7 @@
- 	}
- }
- 
-+void
- gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf)
- {
- 	GtkWidget *combo;
-diff -Nru mdbtools-0.6pre1.orig/src/libmdb/backend.c mdbtools-0.6pre1/src/libmdb/backend.c
--- mdbtools-0.6pre1.orig/src/libmdb/backend.c	2004-06-11 15:56:41.000000000 +0200
-+++ mdbtools-0.6pre1/src/libmdb/backend.c	2007-11-07 16:37:20.000000000 +0100
-@@ -28,7 +28,7 @@
- #endif
- 
- static int is_init;
-static GHashTable *mdb_backends;
-+GHashTable *mdb_backends;
- 
-    /*    Access data types */
- static MdbBackendType mdb_access_types[] = {
-diff -Nru mdbtools-0.6pre1.orig/src/libmdb/index.c mdbtools-0.6pre1/src/libmdb/index.c
--- mdbtools-0.6pre1.orig/src/libmdb/index.c	2004-04-16 17:45:14.000000000 +0200
-+++ mdbtools-0.6pre1/src/libmdb/index.c	2007-11-07 16:37:20.000000000 +0100
-@@ -330,7 +330,7 @@
- {
- 	int mask_bit = 0;
- 	int mask_pos = 0x16;
-	int mask_byte;
-+	int mask_byte = 0;
- 	int elem = 0;
- 	int len, start, i;
- 
-diff -Nru mdbtools-0.6pre1.orig/src/libmdb/kkd.c mdbtools-0.6pre1/src/libmdb/kkd.c
--- mdbtools-0.6pre1.orig/src/libmdb/kkd.c	2003-04-29 19:55:17.000000000 +0200
-+++ mdbtools-0.6pre1/src/libmdb/kkd.c	2007-11-07 16:37:20.000000000 +0100
-@@ -55,7 +55,7 @@
- 
- GHashTable *mdb_get_column_def(MdbCatalogEntry *entry, int start)
- {
-GHashTable *hash;
-+GHashTable *hash = NULL;
- MdbHandle *mdb = entry->mdb;
- MdbColumnProp prop;
- int tmp, pos, col_num, val_len, i;
-diff -Nru mdbtools-0.6pre1.orig/src/sql/mdbsql.c mdbtools-0.6pre1/src/sql/mdbsql.c
--- mdbtools-0.6pre1.orig/src/sql/mdbsql.c	2004-05-30 07:50:40.000000000 +0200
-+++ mdbtools-0.6pre1/src/sql/mdbsql.c	2007-11-07 16:40:25.000000000 +0100
-@@ -84,7 +84,7 @@
- 		return 1;
- 	}
- }
-int mdb_run_query(MdbSQL *sql, char *query)
-+int mdb_sql_run_query(MdbSQL *sql, char *query)
- {
- 	if (_parse(sql,query) && sql->cur_table) {
- 		mdb_sql_bind_all(sql);
--- a/mdbtools.spec
+++ b/mdbtools.spec
@@ -1,6 +1,6 @@
 %define sourcever %(echo %version | cut -d. -f1-2)
 Name:          mdbtools
-Version:       1.0.0
+Version:       1.0.1
 Release:       1mamba
 Summary:       A set of utilities for reading Microsoft Access database (MDB) files
 Group:         System/Tools
@@ -9,22 +9,11 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://github.com/mdbtools/mdbtools
 Source:        https://github.com/mdbtools/mdbtools.git/v%{version}/mdbtools-%{version}.tar.bz2
-Patch0:        mdbtools-0.6pre1-gcc4.patch
-Patch1:        mdbtools-0.6pre1-ooo.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libgdk-pixbuf-devel
-BuildRequires: libglade-devel
 BuildRequires: libglib-devel
-%ifarch x86_64 %{ix86}
-BuildRequires: libgnome-devel
-BuildRequires: libgnomeui-devel
-%endif
-BuildRequires: libgtk2-devel
-BuildRequires: libltdl-devel
 BuildRequires: libodbc-devel
-BuildRequires: libpango-devel
 BuildRequires: libreadline-devel
 ## AUTOBUILDREQ-END
 BuildRequires: txt2man
@@ -59,9 +48,6 @@ GNOME frontend from %{name}.

 %prep
 %setup -q
-#mv brianb-mdbtools*/* .
-#sed -i "s|libtooloze|libtoolize|" autogen.sh
-#./autogen.sh
 autoreconf -f -i

 %build
@@ -86,26 +72,13 @@ rm -rf %{buildroot}%{_localstatedir}/scrollkeeper
 %{_mandir}/man1/mdb-*.1*
 %doc COPYING

-#%ifarch %{ix86} x86_64
-#%files -n gmdb
-#%defattr(-,root,root)
-#%{_bindir}/gmdb2
-#%{_datadir}/gmdb/*
-#%{_datadir}/omf/mdbtools/gmdb-C.omf
-#%dir %{_datadir}/gnome/help/gmdb
-#%dir %{_datadir}/gnome/help/gmdb/C
-#%{_datadir}/gnome/help/gmdb/C/*
-#%endif
-
 %files -n libmdb
 %defattr(-,root,root)
 %{_libdir}/libmdbsql.so.*
 %{_libdir}/libmdb.so.*
 %{_libdir}/odbc/libmdbodbc.a
-%{_libdir}/odbc/libmdbodbc.la
 %{_libdir}/odbc/libmdbodbc.so
 %{_libdir}/odbc/libmdbodbcW.a
-%{_libdir}/odbc/libmdbodbcW.la
 %{_libdir}/odbc/libmdbodbcW.so
 %doc AUTHORS COPYING.LIB

@@ -113,15 +86,16 @@ rm -rf %{buildroot}%{_localstatedir}/scrollkeeper
 %defattr(-,root,root)
 %{_includedir}/*.h
 %{_libdir}/libmdbsql.a
-%{_libdir}/libmdbsql.la
 %{_libdir}/libmdbsql.so
 %{_libdir}/libmdb.a
-%{_libdir}/libmdb.la
 %{_libdir}/libmdb.so
 %{_libdir}/pkgconfig/*.pc
 #%doc ChangeLog NEWS README TODO

 %changelog
+* Sat Dec 28 2024 Automatic Build System <autodist@openmamba.org> 1.0.1-1mamba
+- automatic version update by autodist
+
 * Mon Dec 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.0-1mamba
 - update to 1.0.0