[arch-commits] CVS update of extra/multimedia/gthumb (PKGBUILD gthumb.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:14:35
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/gthumb

Modified: PKGBUILD (1.36 -> 1.37) gthumb.install (1.6 -> 1.7)

upgpkg: gthumb 2.10.2-1
Move to /usr


----------------+
 PKGBUILD       |   22 ++++++++++------------
 gthumb.install |   12 +++++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)


Index: extra/multimedia/gthumb/PKGBUILD
diff -u extra/multimedia/gthumb/PKGBUILD:1.36 extra/multimedia/gthumb/PKGBUILD:1.37
--- extra/multimedia/gthumb/PKGBUILD:1.36	Sat Mar 31 13:43:51 2007
+++ extra/multimedia/gthumb/PKGBUILD	Sun Apr 22 11:14:34 2007
@@ -1,37 +1,35 @@
-# $Id: PKGBUILD,v 1.36 2007/03/31 17:43:51 jgc Exp $
+# $Id: PKGBUILD,v 1.37 2007/04/22 15:14:34 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
  
 pkgname=gthumb
-pkgver=2.10.1
+pkgver=2.10.2
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://gthumb.sourceforge.net/"
-depends=('libgphoto2>=2.3.1' 'libgnomeui>=2.18.1' 'libxtst' 'libxxf86vm')
+depends=('libgphoto2>=2.3.1' 'libgnomeui>=2.18.1-2' 'libxtst' 'libxxf86vm' 'scrollkeeper' 'desktop-file-utils')
 makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
 options=('nolibtool')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('80061c224b4822da588330013e5f198e')
+md5sums=('fbd779a16ea3c715d2a10911c41937ed')
 
 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
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --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/multimedia/gthumb/gthumb.install
diff -u extra/multimedia/gthumb/gthumb.install:1.6 extra/multimedia/gthumb/gthumb.install:1.7
--- extra/multimedia/gthumb/gthumb.install:1.6	Sat Mar 24 14:12:13 2007
+++ extra/multimedia/gthumb/gthumb.install	Sun Apr 22 11:14:34 2007
@@ -1,8 +1,8 @@
 pkgname=gthumb
 
 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() {