[arch-commits] CVS update of extra/gnome/evince (PKGBUILD evince.install)

[Jan de Groot]

    Date: Thursday, March 13, 2008 @ 20:15:50
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/evince

Modified: PKGBUILD (1.41 -> 1.42) evince.install (1.15 -> 1.16)

upgpkg: evince 2.22.0-1
    GNOME 2.22


----------------+
 PKGBUILD       |   23 ++++++++---------------
 evince.install |    5 -----
 2 files changed, 8 insertions(+), 20 deletions(-)


Index: extra/gnome/evince/PKGBUILD
diff -u extra/gnome/evince/PKGBUILD:1.41 extra/gnome/evince/PKGBUILD:1.42
--- extra/gnome/evince/PKGBUILD:1.41	Tue Dec 25 09:42:56 2007
+++ extra/gnome/evince/PKGBUILD	Thu Mar 13 20:15:48 2008
@@ -1,31 +1,24 @@
-# $Id: PKGBUILD,v 1.41 2007/12/25 14:42:56 jgc Exp $
+# $Id: PKGBUILD,v 1.42 2008/03/14 00:15:48 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evince
-pkgver=2.20.2
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('ghostscript' 'poppler-glib>=0.6.3' 'libdjvu' 'gnome-icon-theme>=2.20.0' 't1lib' 'libglade>=2.6.2' 'gnome-vfs>=2.20.1' 'gnome-keyring>=2.20.2')
-makedepends=('intltool' 'gnome-doc-utils>=0.12.0' 'nautilus>=2.20.0' 'pkgconfig' 'tetex' 'gnome-common>=2.20.0' 'gtk-doc')
+depends=('ghostscript' 'poppler-glib>=0.6.3' 'libdjvu>=3.5.20' 'gnome-icon-theme>=2.22.0' 't1lib' 'libglade>=2.6.2' 'gnome-keyring>=2.22.0')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'nautilus>=2.22.0' 'pkgconfig' 'tetex')
 install=evince.install
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
-	evince-no-gnomeprint.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
 replaces=('gpdf')
 groups=('gnome-extra')
-md5sums=('15214f5211d9f98ffa0afd8158b7d021'
-         'cedfcf780e71d07a27a0456ea30f5b0d')
+md5sums=('9fc7eb5757549626b7515b853a5f6b97')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/evince-no-gnomeprint.patch || return 1
-  intltoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --with-print=gtk --enable-nautilus \
@@ -37,7 +30,7 @@
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
   
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/evince/evince.install
diff -u extra/gnome/evince/evince.install:1.15 extra/gnome/evince/evince.install:1.16
--- extra/gnome/evince/evince.install:1.15	Sat Sep 22 08:57:01 2007
+++ extra/gnome/evince/evince.install	Thu Mar 13 20:15:50 2008
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*