summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD50
-rw-r--r--gnome-doc-utils-fix.diff11
-rw-r--r--mdbtools-git.install11
4 files changed, 37 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5c492e6f5a5f..ca6a6fc4e265 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
# Generated by mksrcinfo v7
-# Thu Dec 3 12:10:37 UTC 2015
+# Thu Dec 3 17:43:10 UTC 2015
pkgbase = mdbtools-git
pkgdesc = A set of libraries and utilities for reading Microsoft Access database (MDB) files.
pkgver = 0.7.r197.g3b6d88f
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/brianb/mdbtools
+ install = mdbtools-git.install
arch = i686
arch = x86_64
license = GPL
makedepends = git
makedepends = txt2man
depends = gnome-doc-utils
+ depends = libgnomeui
provides = mdbtools
conflicts = mdbtools
- source = git://github.com/brianb/mdbtools.git
- source = gnome-doc-utils-fix.diff
+ options = !emptydirs
+ source = mdbtools-git::git://github.com/brianb/mdbtools.git
md5sums = SKIP
- md5sums = b441e5f2de56b9a339593d83c9516cf6
pkgname = mdbtools-git
diff --git a/PKGBUILD b/PKGBUILD
index 5122b458c06f..c9a9b571d3f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,42 @@
-# Maintainer: Kamil Śliwak <cameel2/at/gmail/com>
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Kamil Śliwak <cameel2/at/gmail/com>
pkgname=mdbtools-git
-_gitname=mdbtools
pkgver=0.7.r197.g3b6d88f
-pkgrel=1
+pkgrel=2
pkgdesc="A set of libraries and utilities for reading Microsoft Access database (MDB) files."
arch=('i686' 'x86_64')
url="https://github.com/brianb/mdbtools"
-depends=('gnome-doc-utils')
+depends=('gnome-doc-utils' 'libgnomeui')
makedepends=('git' 'txt2man')
provides=('mdbtools')
conflicts=('mdbtools')
license=('GPL')
-source=(
- 'git://github.com/brianb/mdbtools.git'
- 'gnome-doc-utils-fix.diff'
-)
-md5sums=(
- 'SKIP'
- 'b441e5f2de56b9a339593d83c9516cf6'
-)
+options=('!emptydirs')
+install=${pkgname}.install
+source=("${pkgname}::git://github.com/brianb/mdbtools.git")
+md5sums=('SKIP')
pkgver() {
- cd $srcdir/$_gitname
-
- echo $(git describe --always | sed -r 's|([^-]*-g)|r\1|;s|-|.|g')
+ cd ${pkgname}
+ echo $(git describe --always | sed -r 's|([^-]*-g)|r\1|;s|-|.|g')
}
prepare() {
- cd $srcdir/$_gitname
-
- # A workaround for 'ENABLE_SK not defined' error. Does not seem to be fixed
- # in master yet. See https://github.com/brianb/mdbtools/issues/37
- patch $srcdir/$_gitname/configure.ac $startdir/gnome-doc-utils-fix.diff
-
- autoreconf --install --force
- ./configure --prefix=/usr
+ cd ${pkgname}
+ autoreconf -fi
}
build() {
- cd $srcdir/$_gitname
-
- make
+ cd ${pkgname}
+ ./configure --prefix=/usr \
+ --disable-maintainer-mode \
+ --disable-dependency-tracking
+ make V=0
}
package(){
- cd $srcdir/$_gitname
-
- make DESTDIR="$pkgdir" install
- install -Dm644 src/gmdb2/gmdb.desktop "$pkgdir"/usr/share/applications/gmdb.desktop
+ cd ${pkgname}
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 "src/gmdb2/gmdb.desktop" "${pkgdir}/usr/share/applications/gmdb.desktop"
}
diff --git a/gnome-doc-utils-fix.diff b/gnome-doc-utils-fix.diff
deleted file mode 100644
index df8a62960698..000000000000
--- a/gnome-doc-utils-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2014-01-07 17:03:46.000000000 +0100
-+++ configure.ac 2014-01-07 17:04:05.480975158 +0100
-@@ -196,6 +196,8 @@
- fi
-
- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)
-+AM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)
-
- ##################################################
- # Check for txt2man
diff --git a/mdbtools-git.install b/mdbtools-git.install
new file mode 100644
index 000000000000..2eaa60550d51
--- /dev/null
+++ b/mdbtools-git.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}