Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/jack2/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/vim/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	testing/dmraid/PKGBUILD
	testing/dmraid/dmraid_hook
	testing/dmraid/dmraid_install
	testing/e2fsprogs/PKGBUILD
	testing/openssh/PKGBUILD
	testing/openssh/sshd.pam
	testing/php/PKGBUILD
	testing/php/php-fpm.conf.in.patch
	testing/php/php.ini.patch
	testing/xfce4-session/PKGBUILD

1 files changed, 12 insertions, 24 deletions

diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index 6e0b38f27..40447b760 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,63 +1,51 @@
-# $Id: PKGBUILD 149637 2012-02-08 21:50:56Z ronald $
+# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.8.7
+pkgver=2.9.0
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fuse.sourceforge.net/"
-license="GPL2"
+license=('GPL2')
 depends=('glibc')
 makedepends=('pkg-config')
 backup=(etc/fuse.conf)
-install=fuse.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('284f22401131ec148bd04362dc86f7b0e94fb5f4'
+sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
   # fix building with glibc-2.14
   sed -i '1i#define _GNU_SOURCE' util/fusermount.c
 
-  ./configure --prefix=/usr --enable-lib \
+  ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \
               --enable-util --bindir=/bin
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
   make DESTDIR=${pkgdir} install
 
-  # static device nodes will cause collision.
-  rm -rf ${pkgdir}/dev
- 
   # Remove init script in wrong path
   # Don't add our own for now, as fusectl fs oopses on 2.6.18
   rm -rf ${pkgdir}/etc/init.d
   #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
 
-  install -d ${pkgdir}/lib
-  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/
-  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver}
-  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2
-  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/
-  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1
-  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1
-
   # install sample config file
   install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
 
-  # Fix udev rule location
-  install -d -m755 "${pkgdir}/lib"
-  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
+  # remove udev rules (is in the udev package}
+  rm -rf ${pkgdir}/etc/udev
 
-  # remove udev rules (should already be in udev package}
-  rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules
+  # static device nodes are handled by udev
+  rm -rf ${pkgdir}/dev
 }