[arch-commits] Commit in ggv/trunk (PKGBUILD)

[Jan de Groot]

    Date: Tuesday, August 2, 2011 @ 12:26:23
  Author: jgc
Revision: 134235

Kill AC_PATH_XTRA

Modified:
  ggv/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-02 16:11:08 UTC (rev 134234)
+++ PKGBUILD	2011-08-02 16:26:23 UTC (rev 134235)
@@ -2,27 +2,29 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=ggv
 pkgver=2.12.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Postscript viewer"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.14.1' 'ghostscript' 'desktop-file-utils')
-makedepends=('intltool' 'gnome-doc-utils' 'pkgconfig')
+depends=('libgnomeui' 'ghostscript' 'desktop-file-utils')
+makedepends=('intltool' 'gnome-doc-utils' 'pkgconfig' 'gnome-common')
 url="http://www.gnome.org"
 install=ggv.install
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/ggv/2.12/ggv-${pkgver}.tar.bz2)
 md5sums=('418f0ef3f8b82bb0c423a2a1cf6769f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed '/AC_PATH_XTRA/d' -i configure.in 
+  autoreconf --force --install
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/ggv \
-              --localstatedir=/var || return 1
-  make || return 1
-  make GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+      --libexecdir=/usr/lib/ggv \
+      --localstatedir=/var
+  make
+  make GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas --domain ggv ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas --domain ggv ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
 }