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

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 06:19:34
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/nautilus

Modified: PKGBUILD (1.36 -> 1.37) nautilus.install (1.9 -> 1.10)

upgpkg: nautilus 2.18.3-1
Migrate to gconfpkg


------------------+
 PKGBUILD         |   10 +++++-----
 nautilus.install |   13 ++-----------
 2 files changed, 7 insertions(+), 16 deletions(-)


Index: extra/gnome/nautilus/PKGBUILD
diff -u extra/gnome/nautilus/PKGBUILD:1.36 extra/gnome/nautilus/PKGBUILD:1.37
--- extra/gnome/nautilus/PKGBUILD:1.36	Thu May 31 07:47:17 2007
+++ extra/gnome/nautilus/PKGBUILD	Sat Jul  7 06:19:34 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.36 2007/05/31 11:47:17 jgc Exp $
+# $Id: PKGBUILD,v 1.37 2007/07/07 10:19:34 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus
-pkgver=2.18.1
-pkgrel=2
+pkgver=2.18.3
+pkgrel=1
 pkgdesc="The GNOME shell and file manager"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('librsvg>=2.16.1' 'eel>=2.18.0.1-2' 'libbeagle>=0.2.16.3' 'libexif>=0.6.13' 'gnome-icon-theme>=2.18.0')
+depends=('librsvg>=2.16.1' 'eel>=2.18.3' 'libbeagle>=0.2.16.3' 'libexif>=0.6.13' 'gnome-icon-theme>=2.18.0' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
@@ -16,7 +16,7 @@
 install=nautilus.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
 	12_list-view_expand.patch)
-md5sums=('e4718f37080b7d98cd5707e617d43ae6' 'db774f1f95852ff3ed044d0eb65609fb')
+md5sums=('e027b4e1a925122ef3e7f54323cc3c44' 'db774f1f95852ff3ed044d0eb65609fb')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/nautilus/nautilus.install
diff -u extra/gnome/nautilus/nautilus.install:1.9 extra/gnome/nautilus/nautilus.install:1.10
--- extra/gnome/nautilus/nautilus.install:1.9	Sun Apr 22 11:09:46 2007
+++ extra/gnome/nautilus/nautilus.install	Sat Jul  7 06:19:34 2007
@@ -1,8 +1,7 @@
 pkgname=nautilus
 
 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
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,15 +15,7 @@
 }
 
 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() {