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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:38:01
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/evince

Modified: PKGBUILD (1.33 -> 1.34) evince.install (1.12 -> 1.13)

upgpkg: evince 0.8.1-2
Depend on poppler-glib, move to /usr


----------------+
 PKGBUILD       |   41 +++++++++++++++--------------------------
 evince.install |   14 +++++++-------
 2 files changed, 22 insertions(+), 33 deletions(-)


Index: extra/gnome/evince/PKGBUILD
diff -u extra/gnome/evince/PKGBUILD:1.33 extra/gnome/evince/PKGBUILD:1.34
--- extra/gnome/evince/PKGBUILD:1.33	Mon Apr  9 16:59:48 2007
+++ extra/gnome/evince/PKGBUILD	Sun Apr 22 12:38:00 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.33 2007/04/09 20:59:48 jgc Exp $
+# $Id: PKGBUILD,v 1.34 2007/04/22 16:38:00 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 # NOTE: pacman -Rd libgnomeprint libgnomeprintui before compilation.
 
 pkgname=evince
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1' 'ghostscript' 'poppler>=0.5.4' 'libdjvu' 'gnome-icon-theme>=2.18.0' 't1lib')
-makedepends=('perlxml' 'gnome-doc-utils' 'nautilus>=2.18.0.1' 'pkgconfig' 'tetex')
+depends=('libgnomeui>=2.18.1-2' 'ghostscript' 'poppler-glib' 'libdjvu' 'gnome-icon-theme>=2.18.0' 't1lib' 'scrollkeeper')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'nautilus>=2.18.1' 'pkgconfig' 'tetex')
 install=evince.install
 options=('nolibtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2)
@@ -20,30 +20,19 @@
 md5sums=('f09c8d2a6c75abe50c6db7833d66a5b4')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  autoconf
-  ./configure --prefix=/opt/gnome \
-  	--with-print=gtk \
-  	--enable-nautilus \
-	--enable-pdf \
-	--enable-tiff \
-	--enable-djvu \
-	--enable-dvi \
-	--enable-t1lib \
-	--enable-pixbuf \
-	--enable-comics \
-	--enable-impress \
-	--disable-static \
-	--disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --with-print=gtk --enable-nautilus \
+	      --enable-pdf --enable-tiff \
+	      --enable-djvu --enable-dvi \
+	      --enable-t1lib --enable-pixbuf \
+	      --enable-comics --enable-impress \
+	      --disable-scrollkeeper
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/evince/evince.install
diff -u extra/gnome/evince/evince.install:1.12 extra/gnome/evince/evince.install:1.13
--- extra/gnome/evince/evince.install:1.12	Fri Dec 29 15:00:08 2006
+++ extra/gnome/evince/evince.install	Sun Apr 22 12:38:00 2007
@@ -1,10 +1,8 @@
-[ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
 pkgname=evince
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
   update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
@@ -19,14 +17,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
     schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {