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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:35:46
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/eog

Modified: PKGBUILD (1.32 -> 1.33) eog.install (1.10 -> 1.11)

upgpkg: eog 2.18.1-1
Move to /usr


-------------+
 PKGBUILD    |   29 +++++++++++++----------------
 eog.install |   12 +++++++-----
 2 files changed, 20 insertions(+), 21 deletions(-)


Index: extra/gnome/eog/PKGBUILD
diff -u extra/gnome/eog/PKGBUILD:1.32 extra/gnome/eog/PKGBUILD:1.33
--- extra/gnome/eog/PKGBUILD:1.32	Mon Mar 19 18:28:18 2007
+++ extra/gnome/eog/PKGBUILD	Sun Apr 22 11:35:46 2007
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD,v 1.32 2007/03/19 22:28:18 jgc Exp $
-# Maintainer: Arjan <arjan at archlinux.org>
-#             Jan de Groot <jgc at archlinux.org>
+# $Id: PKGBUILD,v 1.33 2007/04/22 15:35:46 jgc Exp $
+# Jan de Groot <jgc at archlinux.org>
 
 pkgname=eog
-pkgver=2.18.0.1
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=(i686 x86_64)
-depends=('gnome-desktop>=2.18.0' 'libexif>=0.6.13' 'lcms')
-makedepends=('perlxml' 'pkgconfig')
+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')
 install=eog.install
 groups=('gnome-extra')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('32f4cd4cd3108522eccf0b8fd85c8bbd')
+md5sums=('512f847adc024fde6d10b71b78d3f396')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
   
-  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   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=/opt/gnome --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --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/eog/eog.install
diff -u extra/gnome/eog/eog.install:1.10 extra/gnome/eog/eog.install:1.11
--- extra/gnome/eog/eog.install:1.10	Mon Mar 19 18:28:18 2007
+++ extra/gnome/eog/eog.install	Sun Apr 22 11:35:46 2007
@@ -1,8 +1,8 @@
 pkgname=eog
 
 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
   scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -17,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() {