[arch-commits] CVS update of extra/gnome/nautilus-sendto (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:48:57
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/nautilus-sendto

Modified: PKGBUILD (1.8 -> 1.9) nautilus-sendto.install (1.1 -> 1.2)

upgpkg: nautilus-sendto 0.10-2
Move to /usr


-------------------------+
 PKGBUILD                |   17 ++++++++---------
 nautilus-sendto.install |   12 +++++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)


Index: extra/gnome/nautilus-sendto/PKGBUILD
diff -u extra/gnome/nautilus-sendto/PKGBUILD:1.8 extra/gnome/nautilus-sendto/PKGBUILD:1.9
--- extra/gnome/nautilus-sendto/PKGBUILD:1.8	Mon Apr  9 17:07:30 2007
+++ extra/gnome/nautilus-sendto/PKGBUILD	Sun Apr 22 13:48:57 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.8 2007/04/09 21:07:30 jgc Exp $
+# $Id: PKGBUILD,v 1.9 2007/04/22 17:48:57 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tor Krill <tor at krill.nu>
 
 pkgname=nautilus-sendto
 pkgver=0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Nautilus context menu for sending files."
 arch=(i686 x86_64)
 url="http://www.es.gnome.org/~telemaco/"
 license=('GPL')
-depends=('evolution-data-server>=1.10.1' 'nautilus>=2.18.0')
+depends=('evolution-data-server>=1.10.1-2' 'nautilus>=2.18.1')
 makedepends=('gaim' 'gettext' 'perlxml' 'pkgconfig')
 options=('nolibtool')
 install=nautilus-sendto.install
@@ -18,13 +18,12 @@
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
  
-  mkdir -p ${startdir}/pkg/usr/lib
-  mv ${startdir}/pkg/opt/gnome/lib/gaim ${startdir}/pkg/usr/lib/gaim
-  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/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/nautilus-sendto/nautilus-sendto.install
diff -u extra/gnome/nautilus-sendto/nautilus-sendto.install:1.1 extra/gnome/nautilus-sendto/nautilus-sendto.install:1.2
--- extra/gnome/nautilus-sendto/nautilus-sendto.install:1.1	Tue Apr 10 14:47:19 2007
+++ extra/gnome/nautilus-sendto/nautilus-sendto.install	Sun Apr 22 13:48:57 2007
@@ -1,8 +1,8 @@
 pkgname=nautilus-sendto
 
 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
 }
 
 pre_upgrade() {
@@ -14,14 +14,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
 }
 
 op=$1