[arch-commits] Commit in gnome-mount/repos (3 files)

[Jan de Groot]

    Date: Thursday, April 24, 2008 @ 16:50:51
  Author: jgc
Revision: 903

Merged revisions 2-902 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gnome-mount/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r875 | jgc | 2008-04-24 17:49:15 +0000 (Thu, 24 Apr 2008) | 1 line
  
  upgpkg: gnome-mount 0.8-1
........

Modified:
  gnome-mount/repos/extra-i686/	(properties)
  gnome-mount/repos/extra-i686/PKGBUILD
  gnome-mount/repos/extra-i686/gnome-mount.install

---------------------+
 PKGBUILD            |   19 +++++++++----------
 gnome-mount.install |    5 -----
 2 files changed, 9 insertions(+), 15 deletions(-)


Property changes on: gnome-mount/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gnome-mount/trunk:1
   + /gnome-mount/trunk:1-902

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-24 20:49:51 UTC (rev 902)
+++ extra-i686/PKGBUILD	2008-04-24 20:50:51 UTC (rev 903)
@@ -2,29 +2,28 @@
 # Maintainer: Jan de Groot <jgc at arclinux.org>
 
 pkgname=gnome-mount
-pkgver=0.7
+pkgver=0.8
 pkgrel=1
 pkgdesc="GNOME mount program"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://hal.freedesktop.org/"
-depends=('hal>=0.5.10' 'gnome-keyring>=2.20.1' 'gconf>=2.20.1'
-         'libnotify>=0.4.4')
-makedepends=('pkgconfig' 'perlxml' 'nautilus>=2.20.0')
-options=('!libtool')
+depends=('gnome-keyring>=2.22.1' 'libnotify>=0.4.4')
+makedepends=('pkgconfig' 'perlxml' 'nautilus>=2.22.2')
+options=('!libtool' '!emptydirs')
 groups=('gnome')
 install=gnome-mount.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6a2f14925376c2c494df89cbfbdb2ca5')
+md5sums=('562ec9d0196e5e000bdd249a04a3aa6a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
+              --localstatedir=/var --disable-static || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  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
 }

Modified: extra-i686/gnome-mount.install
===================================================================
--- extra-i686/gnome-mount.install	2008-04-24 20:49:51 UTC (rev 902)
+++ extra-i686/gnome-mount.install	2008-04-24 20:50:51 UTC (rev 903)
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*