Update to 0.9.4

* Remove gmdb2 from package base -- it will have a separate base from
  now on

2 files changed, 30 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 853ef2d9a707..f48e81025f86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,17 @@
 pkgbase = mdbtools
 	pkgdesc = Utilities for viewing data and exporting schema from Microsoft Access database files
-	pkgver = 0.7.1
+	pkgver = 0.9.4
 	pkgrel = 1
-	url = https://github.com/brianb/mdbtools
+	url = https://github.com/mdbtools/mdbtools
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	license = GPL
-	makedepends = bison
-	makedepends = flex
-	makedepends = txt2man
-	makedepends = autoconf
-	makedepends = rarian
 	makedepends = unixodbc
-	makedepends = libgnomeui
-	options = !libtool
-	options = !emptydirs
-	source = mdbtools-0.7.1.tar.gz::https://github.com/brianb/mdbtools/archive/0.7.1.tar.gz
-	source = 0001-Fix-parallel-builds-make-jN-in-SQL-lexer-parser.patch::https://github.com/brianb/mdbtools/commit/2892d519f3323cd3aa2b33690fe6f68504f0e516.patch
-	source = 0002-Fixes-build-error-introduced-by-previous-commit.patch::https://github.com/brianb/mdbtools/commit/2f4b2d12fece5a046ccece256f73728604516326.patch
-	source = 0004-Added-.desktop-file-for-gmdb.patch::https://github.com/brianb/mdbtools/commit/b449ed159d5acdca636066a4a6ba360f66174fc4.patch
-	source = 9999-autoconf-summary.patch
-	md5sums = 477c7af98e75f8e6c987b020d6a822d8
-	md5sums = ee06850e2dcb517d5dbf421acdb7f647
-	md5sums = cc45c73cf9151deeb7e6ce03d2f95eff
-	md5sums = 2f593a039d0d546e37b63b7c2c6c4b77
-	md5sums = 1c570d626e092e5870ef704d1d1e0ca1
-
-pkgname = mdbtools
 	depends = unixodbc
-	depends = glib2
 	optdepends = gmdb2: graphical viewer for MDB files
+	provides = mdbtools=0.9.4
+	source = mdbtools-0.9.4.tar.gz::https://github.com/mdbtools/mdbtools/archive/v0.9.4.tar.gz
+	md5sums = a848ecd30287499f38bc2f3642c20eed
 
-pkgname = gmdb2
-	pkgdesc = Graphical viewer for Microsoft Access database files
-	install = gmdb2.install
-	license = GPL
-	depends = mdbtools=0.7.1
-	depends = libgnomeui
-	depends = desktop-file-utils
-
+pkgname = mdbtools
diff --git a/PKGBUILD b/PKGBUILD
index 9d99a9a39c57..99a91d1b4114 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,42 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Miguel Revilla <yo@miguelrevilla.com>
-# Contributor (AUR): TDY <tdy@gmx.com>
-# Contributor (AUR): Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
+# Maintainer: Cezary Drożak <czarek@drozak.net>
+# Contributor: TDY <tdy@gmx.com>
+# Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Miguel Revilla <yo@miguelrevilla.com>
 
-pkgname=(mdbtools gmdb2)
-pkgver=0.7.1
+_pkgver=0.9.4
+_pkgname=mdbtools
+_srcname="${_pkgname}-${_pkgver}"
+pkgname=mdbtools
+pkgver=${_pkgver//-/_}
 pkgrel=1
+provides=("mdbtools=$pkgver")
 pkgdesc="Utilities for viewing data and exporting schema from Microsoft Access database files"
 arch=('i686' 'x86_64')
-url="https://github.com/brianb/mdbtools"
+url="https://github.com/mdbtools/mdbtools"
 license=('LGPL' 'GPL')
-makedepends=('bison' 'flex' 'txt2man' 'autoconf' 'rarian' 'unixodbc' 'libgnomeui')
-options=('!libtool' '!emptydirs')
-source=($pkgname-$pkgver.tar.gz::$url/archive/${pkgver}.tar.gz
-        0001-Fix-parallel-builds-make-jN-in-SQL-lexer-parser.patch::$url/commit/2892d519f3323cd3aa2b33690fe6f68504f0e516.patch
-        0002-Fixes-build-error-introduced-by-previous-commit.patch::$url/commit/2f4b2d12fece5a046ccece256f73728604516326.patch
-        0004-Added-.desktop-file-for-gmdb.patch::$url/commit/b449ed159d5acdca636066a4a6ba360f66174fc4.patch
-        9999-autoconf-summary.patch)
-md5sums=('477c7af98e75f8e6c987b020d6a822d8'
-         'ee06850e2dcb517d5dbf421acdb7f647'
-         'cc45c73cf9151deeb7e6ce03d2f95eff'
-         '2f593a039d0d546e37b63b7c2c6c4b77'
-         '1c570d626e092e5870ef704d1d1e0ca1')
+makedepends=('unixodbc')
+depends=('unixodbc')
+optdepends=('gmdb2: graphical viewer for MDB files')
+source=("${_srcname}.tar.gz::$url/archive/v${_pkgver}.tar.gz")
+
+md5sums=('a848ecd30287499f38bc2f3642c20eed')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  for patch in ../*.patch; do
-    patch -Np1 -i "$patch"
-  done
-  sed -i 's/@LEXLIB@//' src/*/Makefile.am
+  cd "${srcdir}/${_srcname}"
   autoreconf -i -f
-}  
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_srcname}"
   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
               --with-unixodbc=/usr
   make
 }
 
-package_mdbtools() {
-  depends=('unixodbc' 'glib2')
-  optdepends=('gmdb2: graphical viewer for MDB files')
-  
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package() {
+  cd "${srcdir}/${_srcname}"
   make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" -C src/gmdb2 uninstall
 }
 
-package_gmdb2() {
-  pkgdesc='Graphical viewer for Microsoft Access database files'
-  license=('GPL')
-  depends=("mdbtools=$pkgver" 'libgnomeui' 'desktop-file-utils')
-  install=gmdb2.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/src/gmdb2"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 gmdb.desktop "$pkgdir"/usr/share/applications/gmdb2.desktop
-}
+# vim: ts=2 sw=2 ft=sh et