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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:59:41
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/f-spot

Modified: PKGBUILD (1.18 -> 1.19) f-spot.install (1.3 -> 1.4)

upgpkg: f-spot 0.3.5-2


----------------+
 PKGBUILD       |   23 ++++++++++-------------
 f-spot.install |   12 +++++++-----
 2 files changed, 17 insertions(+), 18 deletions(-)


Index: extra/multimedia/f-spot/PKGBUILD
diff -u extra/multimedia/f-spot/PKGBUILD:1.18 extra/multimedia/f-spot/PKGBUILD:1.19
--- extra/multimedia/f-spot/PKGBUILD:1.18	Mon Apr  9 16:23:48 2007
+++ extra/multimedia/f-spot/PKGBUILD	Sun Apr 22 13:59:40 2007
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.18 2007/04/09 20:23:48 jgc Exp $
+# $Id: PKGBUILD,v 1.19 2007/04/22 17:59:40 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Kritoke <kritoke at nospam.gmail.com>
 
 pkgname=f-spot
 pkgver=0.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal photo management program for GNOME"
 url="http://www.gnome.org/projects/f-spot/"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-sharp>=2.16.0' 'lcms' 'libexif' 'libgphoto2>=2.3.1' 'libjpeg' 'sqlite3')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
+depends=('gnome-sharp>=2.16.0' 'lcms' 'libexif' 'libgphoto2>=2.3.1' 'libjpeg' 'sqlite3' 'libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3' 'gnome-screensaver>=2.18.1')
 options=('nolibtool')
 install=f-spot.install
 source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.3/f-spot-${pkgver}.tar.bz2)
@@ -21,16 +21,13 @@
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-static --disable-scrollkeeper
+  ./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
 
-  rm -rf "${MONO_SHARED_DIR}"
-
-  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/f-spot/f-spot.install
diff -u extra/multimedia/f-spot/f-spot.install:1.3 extra/multimedia/f-spot/f-spot.install:1.4
--- extra/multimedia/f-spot/f-spot.install:1.3	Thu Feb 15 10:38:16 2007
+++ extra/multimedia/f-spot/f-spot.install	Sun Apr 22 13:59:41 2007
@@ -10,8 +10,8 @@
       #> mv photos.db photos.old.db
       #> sqlite photos.old.db .dump | sqlite3 photos.db
 EOM
-  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
@@ -26,14 +26,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() {