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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:09:47
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/nautilus

Modified: PKGBUILD (1.34 -> 1.35) nautilus.install (1.8 -> 1.9)

upgpkg: nautilus 2.18.1-1
Move to /usr


------------------+
 PKGBUILD         |   30 +++++++++++++-----------------
 nautilus.install |   12 +++++++-----
 2 files changed, 20 insertions(+), 22 deletions(-)


Index: extra/gnome/nautilus/PKGBUILD
diff -u extra/gnome/nautilus/PKGBUILD:1.34 extra/gnome/nautilus/PKGBUILD:1.35
--- extra/gnome/nautilus/PKGBUILD:1.34	Mon Mar 19 14:56:46 2007
+++ extra/gnome/nautilus/PKGBUILD	Sun Apr 22 11:09:46 2007
@@ -1,35 +1,31 @@
-# $Id: PKGBUILD,v 1.34 2007/03/19 18:56:46 jgc Exp $
-# Maintainer: Arjan <arjan at archlinux.org>
-#             Jan de Groot <jgc at archlinux.org>
+# $Id: PKGBUILD,v 1.35 2007/04/22 15:09:46 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus
-pkgver=2.18.0.1
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="The GNOME shell and file manager"
-arch=(i686)
-depends=('librsvg>=2.16.1' 'eel>=2.18.0.1' 'libbeagle>=0.2.16.3' 'libexif>=0.6.13' 'gnome-icon-theme>=2.18.0')
+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')
 makedepends=('perlxml' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
 replaces=('fontilus')
-license=(GPL)
 options=('nolibtool')
 install=nautilus.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a4e98623e326c5daa201564eed218594')
+md5sums=('e4718f37080b7d98cd5707e617d43ae6')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-update-mimedb --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --disable-update-mimedb
   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/icons
+  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/nautilus.install
diff -u extra/gnome/nautilus/nautilus.install:1.8 extra/gnome/nautilus/nautilus.install:1.9
--- extra/gnome/nautilus/nautilus.install:1.8	Mon Mar 19 14:56:46 2007
+++ extra/gnome/nautilus/nautilus.install	Sun Apr 22 11:09:46 2007
@@ -1,8 +1,8 @@
 pkgname=nautilus
 
 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
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,13 +16,15 @@
 }
 
 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`    
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {