[arch-commits] Commit in fuse/trunk (PKGBUILD)

[Ronald van Haren]

    Date: Monday, July 18, 2011 @ 16:33:03
  Author: ronald
Revision: 131998

cleanup PKGBUILD; remove udev rule

Modified:
  fuse/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-18 20:27:31 UTC (rev 131997)
+++ PKGBUILD	2011-07-18 20:33:03 UTC (rev 131998)
@@ -4,7 +4,7 @@
 
 pkgname=fuse
 pkgver=2.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64')
 url="http://fuse.sourceforge.net/"
@@ -23,13 +23,13 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-lib \
               --enable-util --bindir=/bin
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   # static device nodes will cause collision.
   rm -rf ${pkgdir}/dev
@@ -40,16 +40,19 @@
   #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/ || return 1
-  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1
-  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1
-  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1
-  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1
-  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1
+  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 || return 1
+  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 (should already be in udev package}
+  rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules
 }