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

[Jan de Groot]

    Date: Thursday, March 13, 2008 @ 19:30:33
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/nautilus

Modified: PKGBUILD (1.43 -> 1.44) nautilus.install (1.10 -> 1.11)

upgpkg: nautilus 2.22.0-1
    Depend on GVFS, needed for computer:// and remote locations


------------------+
 PKGBUILD         |   36 +++++++++---------------------------
 nautilus.install |    5 -----
 2 files changed, 9 insertions(+), 32 deletions(-)


Index: extra/gnome/nautilus/PKGBUILD
diff -u extra/gnome/nautilus/PKGBUILD:1.43 extra/gnome/nautilus/PKGBUILD:1.44
--- extra/gnome/nautilus/PKGBUILD:1.43	Tue Dec 11 14:38:56 2007
+++ extra/gnome/nautilus/PKGBUILD	Thu Mar 13 19:30:33 2008
@@ -1,49 +1,31 @@
-# $Id: PKGBUILD,v 1.43 2007/12/11 19:38:56 jgc Exp $
+# $Id: PKGBUILD,v 1.44 2008/03/13 23:30:33 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus
-pkgver=2.20.0
-pkgrel=4
+pkgver=2.22.0
+pkgrel=1
 pkgdesc="The GNOME shell and file manager"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('librsvg>=2.18.2' 'eel>=2.20.0' 'libbeagle>=0.3.0-2' 'libexif>=0.6.16' 'gnome-icon-theme>=2.20.0' 'desktop-file-utils')
+depends=('librsvg>=2.22.2' 'eel>=2.22.0' 'libbeagle>=0.3.0-3' 'libtracker>=0.6.6' 'libexif>=0.6.16' 'exempi>=1.99.9-2' 'gnome-icon-theme>=2.22.0' 'desktop-file-utils' 'gvfs>=0.2.0.1')
 makedepends=('intltool' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
 replaces=('fontilus')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
-        beagle-0.3.0.patch
-	nautilus-2.20.0-async-thumbnail-framing.patch
-	nautilus-2.20.0-small-font-crasher.patch
-	nautilus-2.20.0-sound-preview-cleanup.patch
-	nautilus-2.20.0-thumbnail-flashing.patch)
-md5sums=('3856ec2ffeba786d12f8f6622e398c33'
-         'dff10b37d6636f6338df6379edc535e6'
-         '58dbb68fe0f549f778af2b5489064e64'
-         '50160d2e6221fc691f39f341467783e9'
-         'bc9e85eeace20684d29f698e145548ca'
-         '340aac6831eb26d04474c389c3150e42')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0fcc02e92cfad239af27e0b47438c44c')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/beagle-0.3.0.patch || return 1
-  patch -Np0 -i ${startdir}/src/nautilus-2.20.0-async-thumbnail-framing.patch || return 1
-  patch -Np0 -i ${startdir}/src/nautilus-2.20.0-small-font-crasher.patch || return 1
-  patch -Np1 -i ${startdir}/src/nautilus-2.20.0-sound-preview-cleanup.patch || return 1
-  patch -Np0 -i ${startdir}/src/nautilus-2.20.0-thumbnail-flashing.patch || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-	      --disable-update-mimedb --disable-esound
+	      --disable-update-mimedb --disable-esound || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
   
-  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
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/nautilus/nautilus.install
diff -u extra/gnome/nautilus/nautilus.install:1.10 extra/gnome/nautilus/nautilus.install:1.11
--- extra/gnome/nautilus/nautilus.install:1.10	Sat Jul  7 06:19:34 2007
+++ extra/gnome/nautilus/nautilus.install	Thu Mar 13 19:30:33 2008
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*