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

[Jan de Groot]

    Date: Saturday, September 22, 2007 @ 08:31:19
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/eog

Modified: PKGBUILD (1.34 -> 1.35) eog.install (1.11 -> 1.12)

upgpkg: eog 2.20.0-1
GNOME 2.20


-------------+
 PKGBUILD    |   19 +++++++------------
 eog.install |   16 ++--------------
 2 files changed, 9 insertions(+), 26 deletions(-)


Index: extra/gnome/eog/PKGBUILD
diff -u extra/gnome/eog/PKGBUILD:1.34 extra/gnome/eog/PKGBUILD:1.35
--- extra/gnome/eog/PKGBUILD:1.34	Fri Jun  1 05:33:30 2007
+++ extra/gnome/eog/PKGBUILD	Sat Sep 22 08:31:19 2007
@@ -1,28 +1,23 @@
-# $Id: PKGBUILD,v 1.34 2007/06/01 09:33:30 jgc Exp $
+# $Id: PKGBUILD,v 1.35 2007/09/22 12:31:19 jgc Exp $
 # Jan de Groot <jgc at archlinux.org>
 
 pkgname=eog
-pkgver=2.18.2
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-desktop>=2.18.1' 'libexif>=0.6.13' 'lcms' 'desktop-file-utils' 'scrollkeeper')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
+depends=('gnome-desktop>=2.20.0' 'libexif>=0.6.16' 'lcms' 'desktop-file-utils' 'gnome-icon-theme>=2.20.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
 install=eog.install
 groups=('gnome-extra')
+options=(!emptydirs)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7e5fc342201ea00404008258c19b4461')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('c60bae13a84bca33d303c63d31e63e54')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-scrollkeeper
   make || return 1
Index: extra/gnome/eog/eog.install
diff -u extra/gnome/eog/eog.install:1.11 extra/gnome/eog/eog.install:1.12
--- extra/gnome/eog/eog.install:1.11	Sun Apr 22 11:35:46 2007
+++ extra/gnome/eog/eog.install	Sat Sep 22 08:31:19 2007
@@ -1,9 +1,7 @@
 pkgname=eog
 
 post_install() {
-  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
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -17,21 +15,11 @@
 }
 
 pre_remove() {
-  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=`usr/bin/gconftool-2 --get-default-source`
-
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }