[arch-commits] Commit in evince/trunk (PKGBUILD evince.install)

[Ionut Biru]

    Date: Monday, September 27, 2010 @ 05:20:42
  Author: ibiru
Revision: 91438

upgpkg: evince 2.31.92-1
update to 2.31.92

Modified:
  evince/trunk/PKGBUILD
  evince/trunk/evince.install

----------------+
 PKGBUILD       |   21 +++++++++------------
 evince.install |   14 ++------------
 2 files changed, 11 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-09-27 09:20:18 UTC (rev 91437)
+++ PKGBUILD    2010-09-27 09:20:42 UTC (rev 91438)
@@ -2,21 +2,21 @@
 # Maintainer: Jan de Groot <j...@archlinux.org>
 
 pkgname=evince
-pkgver=2.30.3
-pkgrel=2
+pkgver=2.31.92
+pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/";
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libspectre>=0.2.6' 'gsfonts' 'poppler-glib>=0.14.0' 
'libdjvu>=3.5.22' 'gnome-icon-theme>=2.30.2' 't1lib' 'libgnome-keyring>=2.30.1' 
'desktop-file-utils' 'gconf>=2.28.1')
-makedepends=('gnome-doc-utils>=0.20.1' 'nautilus>=2.30.1' 'pkgconfig' 
'texlive-bin' 'intltool' 'gobject-introspection')
+depends=('libspectre>=0.2.6' 'gsfonts' 'poppler-glib>=0.14.0' 
'libdjvu>=3.5.22' 'gnome-icon-theme>=2.31.0' 't1lib' 
'libgnome-keyring>=2.31.92' 'desktop-file-utils')
+makedepends=('gnome-doc-utils>=0.20.1' 'nautilus>=2.31.92' 'pkgconfig' 
'texlive-bin' 'intltool' 'gobject-introspection')
 optdepends=('texlive-bin: DVI support')
 replaces=('gpdf')
 groups=('gnome-extra')
 install=evince.install
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('daddd9720bf8fc0156d9a4a5a85485c232393896376707cf7fcedfcbc515732f')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.31/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c9b54f6e5a7345cd2e347a9eb716f13170e362cf21f3453d5d1f8b5d5663f491')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,11 +28,8 @@
       --enable-t1lib --enable-pixbuf \
       --enable-comics --enable-impress \
       --enable-introspection \
-      --disable-scrollkeeper
+      --disable-scrollkeeper \
+      --disable-schemas-install
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" 
--domain evince ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: evince.install
===================================================================
--- evince.install      2010-09-27 09:20:18 UTC (rev 91437)
+++ evince.install      2010-09-27 09:20:42 UTC (rev 91438)
@@ -1,24 +1,14 @@
-pkgname=evince
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
   update-desktop-database -q
 }
 
-pre_upgrade() {
-  pre_remove $1
-}
-
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+  post_install $1
 }