commit 91527089d0522ba9cc9826cabcee6235d17d686f
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 16 22:47:14 2013 +0100
- new Source URL, updated to 0.7.1 (note: new sonames, mdbtools 0.6-pre
left on mdbtools-0.6 branch)
- removed obsolete patches
mdbtools-as_needed.patch | 11 ---
mdbtools-gcc34.patch | 35 ----------
mdbtools-haveiconv_fix.patch | 22 ------
mdbtools-link.patch | 11 ---
mdbtools-odbc_definitions.patch | 146 ----------------------------------------
mdbtools.spec | 73 ++++++++------------
6 files changed, 28 insertions(+), 270 deletions(-)
---
diff --git a/mdbtools.spec b/mdbtools.spec
index 516ab9a..43a7e41 100644
--- a/mdbtools.spec
+++ b/mdbtools.spec
@@ -3,40 +3,32 @@
%bcond_without gnome # without gui package
%bcond_without odbc # without odbc package
#
-%define pre pre2
-%define rel 8
-%define snap 20050624
Summary: Several utilities for using MS-Access .mdb files
Summary(pl.UTF-8): Zbiór narzędzi do używania plików MS-Access (.mdb)
Name: mdbtools
-Version: 0.6
-Release: 0.%{pre}.%{rel}cvs%{snap}
-License: LGPL (library), GPL (gmdb2)
+Version: 0.7.1
+Release: 1
+License: LGPL v2+ (library), GPL v2+ (gmdb2)
Group: Development/Tools
-#Source0:
http://dl.sourceforge.net/mdbtools/%{name}-%{version}%{pre}.tar.gz
-Source0: http://distfiles.gentoo.org/distfiles/%{name}-cvs-%{snap}.tar.gz
-# Source0-md5: 875872ed64c4826c23d0ba5b63f5c489
+Source0:
https://github.com/brianb/mdbtools/archive/0.7.1/%{name}-%{version}.tar.gz
+# Source0-md5: 477c7af98e75f8e6c987b020d6a822d8
Source1: gmdb2.desktop
Source2: gmdb2.png
-Patch0: %{name}-gcc34.patch
-Patch1: %{name}-link.patch
-Patch2: %{name}-as_needed.patch
-Patch3: %{name}-pc.patch
-Patch4: %{name}-haveiconv_fix.patch
-Patch5: %{name}-parallel_make.patch
-Patch6: %{name}-odbc_definitions.patch
-
+Patch0: %{name}-pc.patch
+Patch1: %{name}-parallel_make.patch
URL: http://mdbtools.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
BuildRequires: glib2-devel >= 2.0.0
+%{?with_gnome:BuildRequires: gtk+2-devel >= 2:2.14}
%{?with_gnome:BuildRequires: libglade2-devel >= 2.0.0}
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.0.0}
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
BuildRequires: pkgconfig
BuildRequires: readline-devel
+BuildRequires: txt2man
%{?with_odbc:BuildRequires: unixODBC-devel >= 2.0.0}
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -121,7 +113,7 @@ Summary: gmdb2 - graphical interface for MDB Tools
Summary(pl.UTF-8): gmdb2 - graficzny interfejs do narzędzi MDB
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
-Requires: glib2 >= 2.0.0
+Requires: gtk+2 >= 2:2.14
Requires: libglade2 >= 2.0.0
Requires: libgnomeui >= 2.0.0
@@ -132,24 +124,17 @@ gmdb2 - graphical interface for MDB Tools.
gmdb2 - graficzny interfejs do narzędzi MDB.
%prep
-%setup -q -n %{name}-cvs-%{snap}
-%patch0 -p0
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%setup -q
+%patch0 -p1
+#patch1 -p1
%build
-rm -f acinclude.m4
-touch config.rpath
-%{__autoheader}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
+ --disable-silent-rules \
--enable-sql \
%{?with_odbc:--with-unixodbc=/usr}
@@ -161,13 +146,12 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{libmdb,libmdbsql}.la
+
%if %{with odbc}
-# just a test program, too generic name
-rm -f $RPM_BUILD_ROOT%{_bindir}/unittest
-# internal API
-rm -f $RPM_BUILD_ROOT%{_includedir}/{connectparams.h,mdbodbc.h}
-# this library is meant to be dlopened
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmdbodbc.{la,a}
+# ODBC libraries are meant to be dlopened
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmdbodbc*.{la,a}
%endif
%if %{with gnome}
@@ -175,6 +159,8 @@ install -D %{SOURCE1}
$RPM_BUILD_ROOT%{_desktopdir}/gmdb2.desktop
install -D %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/gmdb2.png
%find_lang gmdb --with-gnome
+%else
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/gmdb2.1
%endif
%clean
@@ -195,19 +181,18 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmdb.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmdb.so.1
+%attr(755,root,root) %ghost %{_libdir}/libmdb.so.2
%attr(755,root,root) %{_libdir}/libmdbsql.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmdbsql.so.1
+%attr(755,root,root) %ghost %{_libdir}/libmdbsql.so.2
%files devel
%defattr(644,root,root,755)
%doc HACKING
%attr(755,root,root) %{_libdir}/libmdb.so
%attr(755,root,root) %{_libdir}/libmdbsql.so
-%{_libdir}/libmdb.la
-%{_libdir}/libmdbsql.la
%{_includedir}
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libmdb.pc
+%{_pkgconfigdir}/libmdbsql.pc
%files static
%defattr(644,root,root,755)
@@ -217,10 +202,8 @@ rm -rf $RPM_BUILD_ROOT
%if %{with odbc}
%files odbc
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmdbodbc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmdbodbc.so.0
-# for dlopening
%attr(755,root,root) %{_libdir}/libmdbodbc.so
+%attr(755,root,root) %{_libdir}/libmdbodbcW.so
%endif
%if %{with gnome}
diff --git a/mdbtools-as_needed.patch b/mdbtools-as_needed.patch
deleted file mode 100644
index fc424b6..0000000
--- a/mdbtools-as_needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
-+++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
-@@ -15,7 +15,7 @@
- $(patsubst %.c, %.lo, $(SQLSOURCES))) \
- $(patsubst %, $(MDBDIR)/%, \
- $(patsubst %.c, %.lo, $(MDBSOURCES)))
--LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
-+LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
- unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la
../sql/libmdbsql.la
-
- ## Need blank statement to avoid compiling odbc.c
diff --git a/mdbtools-gcc34.patch b/mdbtools-gcc34.patch
deleted file mode 100644
index 9adf31c..0000000
--- a/mdbtools-gcc34.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c
mdbtools-0.6pre1/src/gmdb2/sql.c
---- src/gmdb2/sql.c 2004-02-13 13:49:52.000000000 -0500
-+++ src/gmdb2/sql.c 2005-10-18 08:00:19.088362686 -0400
-@@ -38,6 +38,8 @@
-
- static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
- static void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
-+void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
-+void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
-
- void
- gmdb_sql_close_all()
-diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c
mdbtools-0.6pre1/src/gmdb2/table_export.c
---- src/gmdb2/table_export.c 2003-01-14 12:37:44.000000000 -0500
-+++ src/gmdb2/table_export.c 2005-10-18 08:00:19.089362678 -0400
-@@ -37,6 +37,8 @@
- #define NEVER "Never"
- #define AUTOMAT "Automatic (where necessary)"
-
-+void gmdb_table_export_populate_dialog(GladeXML *xml);
-+
- void
- gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep,
char *str)
- {
-diff -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c
mdbtools-0.6pre1/src/odbc/odbc.c
---- src/odbc/odbc.c 2004-05-30 04:06:43.000000000 -0400
-+++ src/odbc/odbc.c 2005-10-18 08:00:19.090362669 -0400
-@@ -46,6 +46,7 @@
- static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
- static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
- static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
-+static void bind_columns(struct _hstmt *stmt);
-
- static void bind_columns (struct _hstmt*);
-
diff --git a/mdbtools-haveiconv_fix.patch b/mdbtools-haveiconv_fix.patch
deleted file mode 100644
index dc0c259..0000000
--- a/mdbtools-haveiconv_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r mdbtools/src/libmdb/file.c mdbtools.fix/src/libmdb/file.c
---- mdbtools/src/libmdb/file.c 2005-06-28 13:53:40.000000000 +0900
-+++ mdbtools.fix/src/libmdb/file.c 2009-09-09 04:02:47.000000000 +0900
-@@ -17,6 +17,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include "config.h"
- #include "mdbtools.h"
-
- #ifdef DMALLOC
-diff -u -r mdbtools/src/libmdb/iconv.c mdbtools.fix/src/libmdb/iconv.c
---- mdbtools/src/libmdb/iconv.c 2005-09-08 08:27:43.000000000 +0900
-+++ mdbtools.fix/src/libmdb/iconv.c 2009-09-09 04:00:36.000000000 +0900
-@@ -17,6 +17,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include "config.h"
- #include "mdbtools.h"
- #include "errno.h"
-
diff --git a/mdbtools-link.patch b/mdbtools-link.patch
deleted file mode 100644
index 771b140..0000000
--- a/mdbtools-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mdbtools-0.5/src/sql/Makefile.am.orig 2002-12-27 16:09:02.000000000
+0100
-+++ mdbtools-0.5/src/sql/Makefile.am 2006-02-21 19:55:28.778581000 +0100
-@@ -2,7 +2,7 @@
- DISTCLEANFILES = parser.c parser.h lexer.c
- AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
- LIBS = $(GLIB_LIBS)
--LDADD = ../libmdb/libmdb.la
-+libmdbsql_la_LIBADD= ../libmdb/libmdb.la
- YACC = @YACC@ -d
-
- dist-hook:
diff --git a/mdbtools-odbc_definitions.patch b/mdbtools-odbc_definitions.patch
deleted file mode 100644
index 03e3280..0000000
--- a/mdbtools-odbc_definitions.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- mdbtools-cvs-20050624/src/odbc/odbc.c.orig 2010-05-24 10:20:59.000000000
-0400
-+++ mdbtools-cvs-20050624/src/odbc/odbc.c 2010-05-25 17:28:05.000000000
-0400
-@@ -210,7 +210,7 @@
- SQLHSTMT hstmt,
- SQLUSMALLINT ipar,
- SQLSMALLINT FAR *pfSqlType,
-- SQLUINTEGER FAR *pcbParamDef,
-+ SQLULEN FAR *pcbParamDef,
- SQLSMALLINT FAR *pibScale,
- SQLSMALLINT FAR *pfNullable)
- {
-@@ -221,8 +221,8 @@
- SQLRETURN SQL_API SQLExtendedFetch(
- SQLHSTMT hstmt,
- SQLUSMALLINT fFetchType,
-- SQLINTEGER irow,
-- SQLUINTEGER FAR *pcrow,
-+ SQLLEN irow,
-+ SQLULEN FAR *pcrow,
- SQLUSMALLINT FAR *rgfRowStatus)
- {
- struct _hstmt *stmt = (struct _hstmt *) hstmt;
-@@ -297,8 +297,8 @@
-
- SQLRETURN SQL_API SQLParamOptions(
- SQLHSTMT hstmt,
-- SQLUINTEGER crow,
-- SQLUINTEGER FAR *pirow)
-+ SQLULEN crow,
-+ SQLULEN FAR *pirow)
- {
- TRACE("SQLParamOptions");
- return SQL_SUCCESS;
-@@ -347,7 +347,7 @@
-
- SQLRETURN SQL_API SQLSetPos(
- SQLHSTMT hstmt,
-- SQLUSMALLINT irow,
-+ SQLSETPOSIROW irow,
- SQLUSMALLINT fOption,
- SQLUSMALLINT fLock)
- {
-@@ -398,11 +398,11 @@
- SQLSMALLINT fParamType,
- SQLSMALLINT fCType,
- SQLSMALLINT fSqlType,
-- SQLUINTEGER cbColDef,
-+ SQLULEN cbColDef,
- SQLSMALLINT ibScale,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValueMax,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN cbValueMax,
-+ SQLLEN FAR *pcbValue)
- {
- struct _hstmt *stmt;
-
-@@ -502,8 +502,8 @@
- SQLUSMALLINT icol,
- SQLSMALLINT fCType,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValueMax,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN cbValueMax,
-+ SQLLEN FAR *pcbValue)
- {
- struct _hstmt *stmt = (struct _hstmt *) hstmt;
- struct _sql_bind_info *cur, *newitem;
-@@ -594,7 +594,7 @@
- SQLSMALLINT cbColNameMax,
- SQLSMALLINT FAR *pcbColName,
- SQLSMALLINT FAR *pfSqlType,
-- SQLUINTEGER FAR *pcbColDef, /* precision */
-+ SQLULEN FAR *pcbColDef, /* precision */
- SQLSMALLINT FAR *pibScale,
- SQLSMALLINT FAR *pfNullable)
- {
-@@ -649,7 +649,7 @@
- SQLPOINTER rgbDesc,
- SQLSMALLINT cbDescMax,
- SQLSMALLINT FAR *pcbDesc,
-- SQLINTEGER FAR *pfDesc)
-+ SQLLEN FAR *pfDesc)
- {
- int namelen, i;
- struct _hstmt *stmt;
-@@ -969,7 +969,7 @@
-
- SQLRETURN SQL_API SQLRowCount(
- SQLHSTMT hstmt,
-- SQLINTEGER FAR *pcrow)
-+ SQLLEN FAR *pcrow)
- {
- struct _hstmt *stmt=(struct _hstmt *)hstmt;
-
-@@ -1002,10 +1002,10 @@
- SQLUSMALLINT ipar,
- SQLSMALLINT fCType,
- SQLSMALLINT fSqlType,
-- SQLUINTEGER cbParamDef,
-+ SQLULEN cbParamDef,
- SQLSMALLINT ibScale,
- SQLPOINTER rgbValue,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN FAR *pcbValue)
- {
- TRACE("SQLSetParam");
- return SQL_SUCCESS;
-@@ -1125,8 +1125,8 @@
- SQLUSMALLINT icol,
- SQLSMALLINT fCType,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValueMax,
-- SQLINTEGER FAR *pcbValue)
-+ SQLLEN cbValueMax,
-+ SQLLEN FAR *pcbValue)
- {
- struct _hstmt *stmt;
- struct _hdbc *dbc;
-@@ -1457,7 +1457,7 @@
- SQLRETURN SQL_API SQLPutData(
- SQLHSTMT hstmt,
- SQLPOINTER rgbValue,
-- SQLINTEGER cbValue)
-+ SQLLEN cbValue)
- {
- TRACE("SQLPutData");
- return SQL_SUCCESS;
-@@ -1466,7 +1466,7 @@
- SQLRETURN SQL_API SQLSetConnectOption(
- SQLHDBC hdbc,
- SQLUSMALLINT fOption,
-- SQLUINTEGER vParam)
-+ SQLULEN vParam)
- {
- TRACE("SQLSetConnectOption");
- return SQL_SUCCESS;
-@@ -1475,7 +1475,7 @@
- SQLRETURN SQL_API SQLSetStmtOption(
- SQLHSTMT hstmt,
- SQLUSMALLINT fOption,
-- SQLUINTEGER vParam)
-+ SQLULEN vParam)
- {
- TRACE("SQLSetStmtOption");
- return SQL_SUCCESS;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mdbtools.git/commitdiff/91527089d0522ba9cc9826cabcee6235d17d686f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
